Moving strncat call into scnprintf to easily track number of displayed bytes. It will be used in following patch.
Link: http://lkml.kernel.org/n/tip-oqjs8kf50g0n65uj8sfql...@git.kernel.org Signed-off-by: Jiri Olsa <jo...@kernel.org> --- tools/perf/util/mem-events.c | 12 +++++++----- tools/perf/util/mem-events.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c index 331cbec5100c..acc46ac26f73 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -236,18 +236,20 @@ int perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info) return l; } -void perf_mem__lck_scnprintf(char *out, size_t sz __maybe_unused, - struct mem_info *mem_info) +int perf_mem__lck_scnprintf(char *out, size_t sz, struct mem_info *mem_info) { u64 mask = PERF_MEM_LOCK_NA; + int l; if (mem_info) mask = mem_info->data_src.mem_lock; if (mask & PERF_MEM_LOCK_NA) - strncat(out, "N/A", 3); + l = scnprintf(out, sz, "N/A"); else if (mask & PERF_MEM_LOCK_LOCKED) - strncat(out, "Yes", 3); + l = scnprintf(out, sz, "Yes"); else - strncat(out, "No", 2); + l = scnprintf(out, sz, "No"); + + return l; } diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h index 9289db6a6d5b..4c0263125f77 100644 --- a/tools/perf/util/mem-events.h +++ b/tools/perf/util/mem-events.h @@ -29,6 +29,6 @@ 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); 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); +int perf_mem__lck_scnprintf(char *out, size_t sz, struct mem_info *mem_info); #endif /* __PERF_MEM_EVENTS_H */ -- 2.4.3
