Moving strncat/strcpy calls into scnprintf to easily track number of displayed bytes. It will be used in following patch.
Link: http://lkml.kernel.org/n/tip-dvtk0c7clgi857x699mk0...@git.kernel.org Signed-off-by: Jiri Olsa <jo...@kernel.org> --- tools/perf/util/mem-events.c | 9 +++++---- tools/perf/util/mem-events.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c index 5f713d77ac8a..aaeb619a9e77 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -228,7 +228,7 @@ static const char * const snoop_access[] = { "HitM", }; -void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info) +int perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info) { size_t i, l = 0; u64 m = PERF_MEM_SNOOP_NA; @@ -246,12 +246,13 @@ void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info) strcat(out, " or "); l += 4; } - strncat(out, snoop_access[i], sz - l); - l += strlen(snoop_access[i]); + l += scnprintf(out + l, sz - l, snoop_access[i]); } if (*out == '\0') - strcpy(out, "N/A"); + l += scnprintf(out, sz - l, "N/A"); + + return l; } void perf_mem__lck_scnprintf(char *out, size_t sz __maybe_unused, diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h index a06efff4ef09..4b5d0b93979b 100644 --- a/tools/perf/util/mem-events.h +++ b/tools/perf/util/mem-events.h @@ -47,7 +47,7 @@ char *perf_mem_events__name(int i); struct mem_info; int perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *mem_info); int perf_mem__lvl_scnprintf(char *out, size_t sz, struct mem_info *mem_info); -void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info); +int perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info); void perf_mem__lck_scnprintf(char *out, size_t sz, struct mem_info *mem_info); #endif /* __PERF_MEM_EVENTS_H */ -- 2.4.3