From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754481AbbG3AVu (ORCPT ); Wed, 29 Jul 2015 20:21:50 -0400 Received: from mga11.intel.com ([192.55.52.93]:19143 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754384AbbG3AVs (ORCPT ); Wed, 29 Jul 2015 20:21:48 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,573,1432623600"; d="scan'208";a="772704296" From: Andi Kleen To: acme@kernel.org Cc: jolsa@kernel.org, eranian@google.com, linux-kernel@vger.kernel.org, Andi Kleen Subject: [PATCH 1/4] perf, tools: Do not include escape sequences in color_vfprintf return Date: Wed, 29 Jul 2015 17:21:37 -0700 Message-Id: <1438215700-5530-2-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1438215700-5530-1-git-send-email-andi@firstfloor.org> References: <1438215700-5530-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen color_vprintf was including the length of the invisible escape sequences in its return argument. Don't include them to make the return value usable for indentation calculations. Signed-off-by: Andi Kleen --- tools/perf/util/color.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c index 55355b3..f3d1d6d 100644 --- a/tools/perf/util/color.c +++ b/tools/perf/util/color.c @@ -83,12 +83,12 @@ static int __color_vfprintf(FILE *fp, const char *color, const char *fmt, } if (perf_use_color_default && *color) - r += fprintf(fp, "%s", color); + fprintf(fp, "%s", color); r += vfprintf(fp, fmt, args); if (perf_use_color_default && *color) - r += fprintf(fp, "%s", PERF_COLOR_RESET); + fprintf(fp, "%s", PERF_COLOR_RESET); if (trail) - r += fprintf(fp, "%s", trail); + fprintf(fp, "%s", trail); return r; } -- 2.4.3