diff options
| author |   Andi Kleen <ak@linux.intel.com> | 2015-08-03 17:50:02 -0700 |
|---|---|---|
| committer |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-08-05 16:46:06 -0300 |
| commit | b7a001d2067830a98e65d1bbbf99a6d435d70616 (patch) | |
| tree | 14d939073a15e0a564b0ce7bd92d0fdda28e05e2 /tools/perf/util/color.c | |
| parent | perf tools: Remove trail argument to color vsprintf (diff) | |
| download | linux-dev-b7a001d2067830a98e65d1bbbf99a6d435d70616.tar.xz linux-dev-b7a001d2067830a98e65d1bbbf99a6d435d70616.zip | |
perf tools: Do not include escape sequences in color_vfprintf return
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>
Diffstat (limited to 'tools/perf/util/color.c')
| -rw-r--r-- | tools/perf/util/color.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c index ff051d24a0bb..9b9565416f90 100644 --- a/tools/perf/util/color.c +++ b/tools/perf/util/color.c @@ -67,6 +67,7 @@ static int __color_vsnprintf(char *bf, size_t size, const char *color, return r; } +/* Colors are not included in return value */ static int __color_vfprintf(FILE *fp, const char *color, const char *fmt, 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) - 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); return r; } |