perf tools: Do not include escape sequences in color_vfprintf return

Andi Kleen · acmel · commit b7a001d20678 · 2015-08-05T16:46:06.000-03:00
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
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ static int __color_vsnprintf(char bf, size_t size, const char color,`
`67`	`67`	`return r;`
`68`	`68`	`}`
`69`	`69`
	`70`	`+/* Colors are not included in return value */`
`70`	`71`	`static int __color_vfprintf(FILE fp, const char color, const char *fmt,`
`71`	`72`	`va_list args)`
`72`	`73`	`{`
`@@ -83,10 +84,10 @@ static int __color_vfprintf(FILE fp, const char color, const char *fmt,`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`if (perf_use_color_default && *color)`
`86`		`- r += fprintf(fp, "%s", color);`
	`87`	`+ fprintf(fp, "%s", color);`
`87`	`88`	`r += vfprintf(fp, fmt, args);`
`88`	`89`	`if (perf_use_color_default && *color)`
`89`		`- r += fprintf(fp, "%s", PERF_COLOR_RESET);`
	`90`	`+ fprintf(fp, "%s", PERF_COLOR_RESET);`
`90`	`91`	`return r;`
`91`	`92`	`}`
`92`	`93`