perf tools: Remove trail argument to color vsprintf

Jiri Olsa · acmel · commit 8011de7ab3b1 · 2015-08-05T16:44:02.000-03:00
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>
diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c
@@ -68,7 +68,7 @@ static int __color_vsnprintf(char *bf, size_t size, const char *color,
 }
 
 static int __color_vfprintf(FILE *fp, const char *color, const char *fmt,
-		va_list args, const char *trail)
+		va_list args)
 {
 	int r = 0;
 
@@ -87,8 +87,6 @@ static int __color_vfprintf(FILE *fp, const char *color, const char *fmt,
 	r += vfprintf(fp, fmt, args);
 	if (perf_use_color_default && *color)
 		r += fprintf(fp, "%s", PERF_COLOR_RESET);
-	if (trail)
-		r += fprintf(fp, "%s", trail);
 	return r;
 }
 
@@ -100,7 +98,7 @@ int color_vsnprintf(char *bf, size_t size, const char *color,
 
 int color_vfprintf(FILE *fp, const char *color, const char *fmt, va_list args)
 {
-	return __color_vfprintf(fp, color, fmt, args, NULL);
+	return __color_vfprintf(fp, color, fmt, args);
 }
 
 int color_snprintf(char *bf, size_t size, const char *color,
@@ -126,16 +124,6 @@ int color_fprintf(FILE *fp, const char *color, const char *fmt, ...)
 	return r;
 }
 
-int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...)
-{
-	va_list args;
-	int r;
-	va_start(args, fmt);
-	r = __color_vfprintf(fp, color, fmt, args, "\n");
-	va_end(args);
-	return r;
-}
-
 /*
  * This function splits the buffer by newlines and colors the lines individually.
  *
diff --git a/tools/perf/util/color.h b/tools/perf/util/color.h
@@ -35,7 +35,6 @@ int color_vsnprintf(char *bf, size_t size, const char *color,
 int color_vfprintf(FILE *fp, const char *color, const char *fmt, va_list args);
 int color_fprintf(FILE *fp, const char *color, const char *fmt, ...);
 int color_snprintf(char *bf, size_t size, const char *color, const char *fmt, ...);
-int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...);
 int color_fwrite_lines(FILE *fp, const char *color, size_t count, const char *buf);
 int value_color_snprintf(char *bf, size_t size, const char *fmt, double value);
 int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...);

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ static int __color_vsnprintf(char bf, size_t size, const char color,`
`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,8 +87,6 @@ static int __color_vfprintf(FILE fp, const char color, const char *fmt,`
`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`
`@@ -100,7 +98,7 @@ int color_vsnprintf(char bf, size_t size, const char color,`
`100`	`98`
`101`	`99`	`int color_vfprintf(FILE fp, const char color, const char *fmt, va_list args)`
`102`	`100`	`{`
`103`		`- return __color_vfprintf(fp, color, fmt, args, NULL);`
	`101`	`+ return __color_vfprintf(fp, color, fmt, args);`
`104`	`102`	`}`
`105`	`103`
`106`	`104`	`int color_snprintf(char bf, size_t size, const char color,`
`@@ -126,16 +124,6 @@ int color_fprintf(FILE fp, const char color, const char *fmt, ...)`
`126`	`124`	`return r;`
`127`	`125`	`}`
`128`	`126`
`129`		`-int color_fprintf_ln(FILE fp, const char color, const char *fmt, ...)`
`130`		`-{`
`131`		`- va_list args;`
`132`		`- int r;`
`133`		`- va_start(args, fmt);`
`134`		`- r = __color_vfprintf(fp, color, fmt, args, "\n");`
`135`		`- va_end(args);`
`136`		`- return r;`
`137`		`-}`
`138`		`-`
`139`	`127`	`/*`
`140`	`128`	`* This function splits the buffer by newlines and colors the lines individually.`
`141`	`129`	`*`