From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755010AbbHFHDh (ORCPT ); Thu, 6 Aug 2015 03:03:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:55974 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754980AbbHFHDe (ORCPT ); Thu, 6 Aug 2015 03:03:34 -0400 Date: Thu, 6 Aug 2015 00:03:22 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: mingo@kernel.org, jolsa@redhat.com, ak@linux.intel.com, jolsa@kernel.org, acme@redhat.com, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, eranian@google.com Reply-To: mingo@kernel.org, ak@linux.intel.com, jolsa@redhat.com, hpa@zytor.com, tglx@linutronix.de, acme@redhat.com, jolsa@kernel.org, eranian@google.com, linux-kernel@vger.kernel.org In-Reply-To: <1438649408-20807-2-git-send-email-andi@firstfloor.org> References: <1438649408-20807-2-git-send-email-andi@firstfloor.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Remove trail argument to color vsprintf Git-Commit-ID: 8011de7ab3b10c5352f3f0708f517de2722b0957 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8011de7ab3b10c5352f3f0708f517de2722b0957 Gitweb: http://git.kernel.org/tip/8011de7ab3b10c5352f3f0708f517de2722b0957 Author: Jiri Olsa AuthorDate: Mon, 3 Aug 2015 17:50:01 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 5 Aug 2015 16:44:02 -0300 perf tools: Remove trail argument to color vsprintf Seems like it's always '\n' through color_fprintf_ln, which is not used at all, removing.. ;-) Signed-off-by: Jiri Olsa Cc: Andi Kleen Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1438649408-20807-2-git-send-email-andi@firstfloor.org Signed-off-by: Andi Kleen Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/color.c | 16 ++-------------- tools/perf/util/color.h | 1 - 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c index 55355b3..ff051d2 100644 --- a/tools/perf/util/color.c +++ b/tools/perf/util/color.c @@ -68,7 +68,7 @@ static int __color_vsnprintf(char *bf, size_t size, const char *color, } static int __color_vfprintf(FILE *fp, const char *color, const char *fmt, - va_list args, const char *trail) + va_list args) { int r = 0; @@ -87,8 +87,6 @@ static int __color_vfprintf(FILE *fp, const char *color, const char *fmt, r += vfprintf(fp, fmt, args); if (perf_use_color_default && *color) r += fprintf(fp, "%s", PERF_COLOR_RESET); - if (trail) - r += fprintf(fp, "%s", trail); return r; } @@ -100,7 +98,7 @@ int color_vsnprintf(char *bf, size_t size, const char *color, int color_vfprintf(FILE *fp, const char *color, const char *fmt, va_list args) { - return __color_vfprintf(fp, color, fmt, args, NULL); + return __color_vfprintf(fp, color, fmt, args); } int color_snprintf(char *bf, size_t size, const char *color, @@ -126,16 +124,6 @@ int color_fprintf(FILE *fp, const char *color, const char *fmt, ...) return r; } -int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...) -{ - va_list args; - int r; - va_start(args, fmt); - r = __color_vfprintf(fp, color, fmt, args, "\n"); - va_end(args); - return r; -} - /* * This function splits the buffer by newlines and colors the lines individually. * diff --git a/tools/perf/util/color.h b/tools/perf/util/color.h index 38146f9..a93997f 100644 --- a/tools/perf/util/color.h +++ b/tools/perf/util/color.h @@ -35,7 +35,6 @@ int color_vsnprintf(char *bf, size_t size, const char *color, int color_vfprintf(FILE *fp, const char *color, const char *fmt, va_list args); int color_fprintf(FILE *fp, const char *color, const char *fmt, ...); int color_snprintf(char *bf, size_t size, const char *color, const char *fmt, ...); -int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...); int color_fwrite_lines(FILE *fp, const char *color, size_t count, const char *buf); int value_color_snprintf(char *bf, size_t size, const char *fmt, double value); int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...);