From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933497Ab3LDUNq (ORCPT ); Wed, 4 Dec 2013 15:13:46 -0500 Received: from merlin.infradead.org ([205.233.59.134]:59339 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933242Ab3LDUHS (ORCPT ); Wed, 4 Dec 2013 15:07:18 -0500 From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Adrian Hunter , Andi Kleen , David Ahern , Frederic Weisbecker , Ingo Molnar , Jiri Olsa , Mike Galbraith , Namhyung Kim , Paul Mackerras , Peter Zijlstra , Stephane Eranian , Arnaldo Carvalho de Melo Subject: [PATCH 01/38] perf tools: Use asprintf instead of malloc plus snprintf Date: Wed, 4 Dec 2013 17:06:25 -0300 Message-Id: <1386187622-2928-2-git-send-email-acme@infradead.org> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1386187622-2928-1-git-send-email-acme@infradead.org> References: <1386187622-2928-1-git-send-email-acme@infradead.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by merlin.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Adrian Hunter The asprintf library function is equivalent to malloc plus snprintf so use it because it is simpler. Signed-off-by: Adrian Hunter Cc: Andi Kleen Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Jiri Olsa Cc: Mike Galbraith Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1386055390-13757-4-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- 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 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) 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); -- 1.8.1.4