Messages in this thread Patch in this message | | | From | Rickard Strandqvist <> | Subject | [PATCH] tools: perf: util: sort.c: Changed from using strncat to strlcat | Date | Sun, 12 Oct 2014 22:40:35 +0200 |
| |
Changed from using strncat to strlcat to simplify the code
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> --- tools/perf/util/sort.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 14e5a03..6e242f0 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -759,8 +759,7 @@ static int hist_entry__snoop_snprintf(struct hist_entry *he, char *bf, size_t size, unsigned int width) { char out[64]; - size_t sz = sizeof(out) - 1; /* -1 for null termination */ - size_t i, l = 0; + size_t i; u64 m = PERF_MEM_SNOOP_NA; out[0] = '\0'; @@ -771,12 +770,9 @@ static int hist_entry__snoop_snprintf(struct hist_entry *he, char *bf, for (i = 0; m && i < NUM_SNOOP_ACCESS; i++, m >>= 1) { if (!(m & 0x1)) continue; - if (l) { - strcat(out, " or "); - l += 4; - } - strncat(out, snoop_access[i], sz - l); - l += strlen(snoop_access[i]); + if (*out != '\0') + strlcat(out, " or ", sizeof(out)); + strlcat(out, snoop_access[i], sizeof(out)); } if (*out == '\0') -- 1.7.10.4
| |