Commit-ID: d88938ebc97df72320609b33aa0cf9a9a98accb1 Gitweb: http://git.kernel.org/tip/d88938ebc97df72320609b33aa0cf9a9a98accb1 Author: Adrian Hunter <adrian.hunter@xxxxxxxxx> AuthorDate: Tue, 3 Dec 2013 09:23:06 +0200 Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> CommitDate: Wed, 4 Dec 2013 13:46:36 -0300 perf tools: Use asprintf instead of malloc plus snprintf The asprintf library function is equivalent to malloc plus snprintf so use it because it is simpler. Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx> Cc: David Ahern <dsahern@xxxxxxxxx> Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Jiri Olsa <jolsa@xxxxxxxxxx> Cc: Mike Galbraith <efault@xxxxxx> Cc: Namhyung Kim <namhyung@xxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Cc: Stephane Eranian <eranian@xxxxxxxxxx> Link: http://lkml.kernel.org/r/1386055390-13757-4-git-send-email-adrian.hunter@xxxxxxxxx Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> --- tools/perf/util/srcline.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c index d11aefb..4c8e816 100644 --- a/tools/perf/util/srcline.c +++ b/tools/perf/util/srcline.c @@ -227,7 +227,6 @@ char *get_srcline(struct dso *dso, unsigned long addr) unsigned line = 0; char *srcline; char *dso_name = dso->long_name; - size_t size; if (!dso->has_srcline) return SRCLINE_UNKNOWN; @@ -241,13 +240,7 @@ char *get_srcline(struct dso *dso, unsigned long addr) if (!addr2line(dso_name, addr, &file, &line)) goto out; - /* just calculate actual length */ - size = snprintf(NULL, 0, "%s:%u", file, line) + 1; - - srcline = malloc(size); - if (srcline) - snprintf(srcline, size, "%s:%u", file, line); - else + if (asprintf(&srcline, "%s:%u", file, line) < 0) srcline = SRCLINE_UNKNOWN; free(file); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|