Em Thu, Apr 07, 2016 at 09:11:11AM +0200, Jiri Olsa escreveu:
> To be used in cases for both sides trim.
>
> Link: http://lkml.kernel.org/n/[email protected]
> Signed-off-by: Jiri Olsa <[email protected]>
Thanks, applied.
Will try Milian's 'perf trace' callchain patch soon, any updates on that one?
- Arnaldo
> tools/perf/ui/browsers/hists.c | 3 +--
> tools/perf/ui/stdio/hist.c | 3 +--
> tools/perf/util/util.h | 5 +++++
> 3 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
> index 2a83414159a6..e70df2e54d66 100644
> --- a/tools/perf/ui/browsers/hists.c
> +++ b/tools/perf/ui/browsers/hists.c
> @@ -1607,9 +1607,8 @@ static int
> hists_browser__scnprintf_hierarchy_headers(struct hist_browser *brows
>
> ret = fmt->header(fmt, &dummy_hpp,
> hists_to_evsel(hists));
> dummy_hpp.buf[ret] = '\0';
> - rtrim(dummy_hpp.buf);
>
> - start = ltrim(dummy_hpp.buf);
> + start = trim(dummy_hpp.buf);
> ret = strlen(start);
>
> if (start != dummy_hpp.buf)
> diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
> index 7aff5acf3265..560eb47d56f9 100644
> --- a/tools/perf/ui/stdio/hist.c
> +++ b/tools/perf/ui/stdio/hist.c
> @@ -569,9 +569,8 @@ static int print_hierarchy_header(struct hists *hists,
> struct perf_hpp *hpp,
> first_col = false;
>
> fmt->header(fmt, hpp, hists_to_evsel(hists));
> - rtrim(hpp->buf);
>
> - header_width += fprintf(fp, "%s", ltrim(hpp->buf));
> + header_width += fprintf(fp, "%s", trim(hpp->buf));
> }
> }
>
> diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
> index 8298d607c738..3bf3de86d429 100644
> --- a/tools/perf/util/util.h
> +++ b/tools/perf/util/util.h
> @@ -254,6 +254,11 @@ int hex2u64(const char *ptr, u64 *val);
> char *ltrim(char *s);
> char *rtrim(char *s);
>
> +static inline char *trim(char *s)
> +{
> + return ltrim(rtrim(s));
> +}
> +
> void dump_stack(void);
> void sighandler_dump_stack(int sig);
>
> --
> 2.4.11
