On Wed, Jul 29, 2015 at 05:21:37PM -0700, Andi Kleen wrote: > From: Andi Kleen <[email protected]> > > 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. > > Signed-off-by: Andi Kleen <[email protected]> > --- > tools/perf/util/color.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c > index 55355b3..f3d1d6d 100644 > --- a/tools/perf/util/color.c > +++ b/tools/perf/util/color.c > @@ -83,12 +83,12 @@ 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);
could you please put in a comment saying we dont include colors in the return length.. > r += vfprintf(fp, fmt, args); > if (perf_use_color_default && *color) > - r += fprintf(fp, "%s", PERF_COLOR_RESET); > + fprintf(fp, "%s", PERF_COLOR_RESET); > if (trail) > - r += fprintf(fp, "%s", trail); > + fprintf(fp, "%s", trail); trail's not color, right? anyway seems like it's always '\n' through color_fprintf_ln, which is not used at all, removing.. ;-) jirka --- It's not used anymore. Link: http://lkml.kernel.org/n/[email protected] Signed-off-by: Jiri Olsa <[email protected]> --- tools/perf/util/color.c | 16 ++-------------- tools/perf/util/color.h | 1 - 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c index 55355b3d4f85..ff051d24a0bb 100644 --- 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 index 38146f922c54..a93997f16dec 100644 --- 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, ...); -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
