aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2013-12-03 02:23:06 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-12-04 11:46:36 -0500
commitd88938ebc97df72320609b33aa0cf9a9a98accb1 (patch)
treeb974eaaa7e6c02c0bbfa2165bcbef104310d9b27 /tools/perf
parent89e3bbd58a6186b832fe2b9419ac2f9ab90e9089 (diff)
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@intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1386055390-13757-4-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/util/srcline.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index d11aefbc4b8d..4c8e816a2191 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)
227 unsigned line = 0; 227 unsigned line = 0;
228 char *srcline; 228 char *srcline;
229 char *dso_name = dso->long_name; 229 char *dso_name = dso->long_name;
230 size_t size;
231 230
232 if (!dso->has_srcline) 231 if (!dso->has_srcline)
233 return SRCLINE_UNKNOWN; 232 return SRCLINE_UNKNOWN;
@@ -241,13 +240,7 @@ char *get_srcline(struct dso *dso, unsigned long addr)
241 if (!addr2line(dso_name, addr, &file, &line)) 240 if (!addr2line(dso_name, addr, &file, &line))
242 goto out; 241 goto out;
243 242
244 /* just calculate actual length */ 243 if (asprintf(&srcline, "%s:%u", file, line) < 0)
245 size = snprintf(NULL, 0, "%s:%u", file, line) + 1;
246
247 srcline = malloc(size);
248 if (srcline)
249 snprintf(srcline, size, "%s:%u", file, line);
250 else
251 srcline = SRCLINE_UNKNOWN; 244 srcline = SRCLINE_UNKNOWN;
252 245
253 free(file); 246 free(file);