iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf tools: Do not include escape sequences in color_vfprintf return

Browse Source 
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.

v2: Add comment, rebase

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1438649408-20807-3-git-send-email-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Andi Kleen 2015-08-03 17:50:02 -07:00 committed by Arnaldo Carvalho de Melo
parent 8011de7ab3
commit b7a001d206
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/perf/util/color.c
View File

@ -67,6 +67,7 @@ static int __color_vsnprintf(char *bf, size_t size, const char *color,
return r; return r;
} }
/* Colors are not included in return value */
static int __color_vfprintf(FILE *fp, const char *color, const char *fmt, static int __color_vfprintf(FILE *fp, const char *color, const char *fmt,
va_list args) va_list args)
{ {
@ -83,10 +84,10 @@ static int __color_vfprintf(FILE *fp, const char *color, const char *fmt,
} }
if (perf_use_color_default && *color) if (perf_use_color_default && *color)
r += fprintf(fp, "%s", color); fprintf(fp, "%s", color);
r += vfprintf(fp, fmt, args); r += vfprintf(fp, fmt, args);
if (perf_use_color_default && *color) if (perf_use_color_default && *color)
r += fprintf(fp, "%s", PERF_COLOR_RESET); fprintf(fp, "%s", PERF_COLOR_RESET);
return r; return r;
} }