diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-05 10:15:16 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-05 10:15:16 +0000 |
| commit | dffe2a3eed105c631500778dfaba0998d7bf8512 (patch) | |
| tree | 4c2492d710e0b101f57a7f399b3e891129b1c8b4 /tools | |
| parent | 3b21b35761de8348dd2f7cff9752449281d7a17b (diff) | |
| parent | 538069756ce13f9d0e0ccb7a17b6935a0bfb7cad (diff) | |
Merge tag 'v3.10.22' into linux-linaro-lsk
This is the 3.10.22 stable release
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/ui/hist.c | 2 | ||||
| -rw-r--r-- | tools/perf/util/color.c | 11 | ||||
| -rw-r--r-- | tools/perf/util/color.h | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index 4bf91b09d62d..794bb1a120be 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c @@ -113,7 +113,7 @@ static u64 he_get_##_field(struct hist_entry *he) \ static int hpp__color_##_type(struct perf_hpp *hpp, struct hist_entry *he) \ { \ return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%", \ - (hpp_snprint_fn)percent_color_snprintf, true); \ + percent_color_snprintf, true); \ } #define __HPP_ENTRY_PERCENT_FN(_type, _field) \ diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c index 11e46da17bbb..66e44a5019d5 100644 --- a/tools/perf/util/color.c +++ b/tools/perf/util/color.c @@ -318,8 +318,15 @@ int percent_color_fprintf(FILE *fp, const char *fmt, double percent) return r; } -int percent_color_snprintf(char *bf, size_t size, const char *fmt, double percent) +int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...) { - const char *color = get_percent_color(percent); + va_list args; + double percent; + const char *color; + + va_start(args, fmt); + percent = va_arg(args, double); + va_end(args); + color = get_percent_color(percent); return color_snprintf(bf, size, color, fmt, percent); } diff --git a/tools/perf/util/color.h b/tools/perf/util/color.h index dea082b79602..fced3840e99c 100644 --- a/tools/perf/util/color.h +++ b/tools/perf/util/color.h @@ -39,7 +39,7 @@ 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 percent_color_snprintf(char *bf, size_t size, const char *fmt, double percent); +int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...); int percent_color_fprintf(FILE *fp, const char *fmt, double percent); const char *get_percent_color(double percent); |