Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1438649408-20807-2-git-send-email-andi@firstfloor.org
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Jiri Olsa and committed by
Arnaldo Carvalho de Melo
8011de7a c3a6a8c4

+2 -15
+2 -14
tools/perf/util/color.c
··· 68 68 } 69 69 70 70 static int __color_vfprintf(FILE *fp, const char *color, const char *fmt, 71 - va_list args, const char *trail) 71 + va_list args) 72 72 { 73 73 int r = 0; 74 74 ··· 87 87 r += vfprintf(fp, fmt, args); 88 88 if (perf_use_color_default && *color) 89 89 r += fprintf(fp, "%s", PERF_COLOR_RESET); 90 - if (trail) 91 - r += fprintf(fp, "%s", trail); 92 90 return r; 93 91 } 94 92 ··· 98 100 99 101 int color_vfprintf(FILE *fp, const char *color, const char *fmt, va_list args) 100 102 { 101 - return __color_vfprintf(fp, color, fmt, args, NULL); 103 + return __color_vfprintf(fp, color, fmt, args); 102 104 } 103 105 104 106 int color_snprintf(char *bf, size_t size, const char *color, ··· 120 122 121 123 va_start(args, fmt); 122 124 r = color_vfprintf(fp, color, fmt, args); 123 - va_end(args); 124 - return r; 125 - } 126 - 127 - int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...) 128 - { 129 - va_list args; 130 - int r; 131 - va_start(args, fmt); 132 - r = __color_vfprintf(fp, color, fmt, args, "\n"); 133 125 va_end(args); 134 126 return r; 135 127 }
-1
tools/perf/util/color.h
··· 35 35 int color_vfprintf(FILE *fp, const char *color, const char *fmt, va_list args); 36 36 int color_fprintf(FILE *fp, const char *color, const char *fmt, ...); 37 37 int color_snprintf(char *bf, size_t size, const char *color, const char *fmt, ...); 38 - int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...); 39 38 int color_fwrite_lines(FILE *fp, const char *color, size_t count, const char *buf); 40 39 int value_color_snprintf(char *bf, size_t size, const char *fmt, double value); 41 40 int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...);