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>

diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c
index ff051d24a0bb2ea60bede4365c4dce0c633a35ff..9b9565416f9037fb59e7e4382b58b34e4857a136 100644 (file)
--- 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;
 }