Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8011de7a authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Remove trail argument to color vsprintf 



Seems like it's always '\n' through color_fprintf_ln, which is not used
at all, removing.. ;-)

Signed-off-by: default avatarJiri 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: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c3a6a8c4

tools/perf/util/color.c

+2 −14
Original line number Diff line number Diff line
@@ -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.

 *

tools/perf/util/color.h

+0 −1
Original line number Diff line number Diff line
@@ -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, ...);