perf tools: Remove trim() implementation, use tools/lib's strim()
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 3ca43b6053c9a5dbbffb02aa010c1ccf8eb460a8 Gitweb: https://git.kernel.org/tip/3ca43b6053c9a5dbbffb02aa010c1ccf8eb460a8 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 26 Jun 2019 12:06:20 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 26 Jun 2019 12:06:20 -0300
perf tools: Remove trim() implementation, use tools/lib's strim()
Moving more stuff out of tools/perf/util/ and using the kernel idiom.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/tests/builtin-test.c | 3 ++- tools/perf/ui/browsers/hists.c | 3 ++- tools/perf/ui/gtk/hists.c | 5 +++-- tools/perf/ui/stdio/hist.c | 2 +- tools/perf/util/string2.h | 5 ----- 5 files changed, 8 insertions(+), 10 deletions(-)
tools/perf/tests/builtin-test.c +2 -1
@@ -22,6 +22,7 @@#include "string2.h" #include "symbol.h" #include <linux/kernel.h> +#include <linux/string.h> #include <subcmd/exec-cmd.h> static bool dont_fork;
@@ -438,7 +439,7 @@ static const char *shell_test__description(char *description, size_t size, description =fgets (description, size, fp);fclose (fp); -return description ?trim (description +1 ) :NULL ; +return description ?strim (description +1 ) :NULL ; }#define for_each_shell_test (dir, base, ent) \
tools/perf/ui/browsers/hists.c +2 -1
@@ -6,6 +6,7 @@#include <stdlib.h> #include <string.h> #include <linux/rbtree.h> +#include <linux/string.h> #include <sys/ttydefaults.h> #include <linux/time64.h>
@@ -1686,7 +1687,7 @@ static int hists_browser__scnprintf_hierarchy_headers(struct hist_browser *brows ret = fmt->header (fmt, &dummy_hpp, hists,0 ,NULL ); dummy_hpp.buf[ret] ='\0' ; - start =trim (dummy_hpp.buf); + start =strim (dummy_hpp.buf); ret =strlen (start);if (start != dummy_hpp.buf)
tools/perf/ui/gtk/hists.c +3 -2
@@ -9,6 +9,7 @@#include "../string2.h" #include "gtk.h" #include <signal.h> +#include <linux/string.h> #define MAX_COLUMNS 32
@@ -459,7 +460,7 @@ static void perf_gtk__add_hierarchy_entries(struct hists *hists,advance_hpp (hpp, ret +2 ); } -gtk_tree_store_set (store, &iter, col_idx,trim (bf),-1 ); +gtk_tree_store_set (store, &iter, col_idx,strim (bf),-1 );if (!he->leaf) { hpp->buf = bf;
@@ -555,7 +556,7 @@ static void perf_gtk__show_hierarchy(GtkWidget *window, struct hists *hists, first_col = false; fmt->header (fmt, &hpp, hists,0 ,NULL ); -strcat (buf,trim (hpp.buf)); +strcat (buf,strim (hpp.buf)); } }
tools/perf/ui/stdio/hist.c +1 -1
@@ -620,7 +620,7 @@ static int hists__fprintf_hierarchy_headers(struct hists *hists, fmt->header (fmt, hpp, hists,0 ,NULL ); - header_width +=fprintf (fp,"%s" ,trim (hpp->buf)); + header_width +=fprintf (fp,"%s" ,strim (hpp->buf)); } }
tools/perf/util/string2.h +0 -5
@@ -25,11 +25,6 @@ char *strxfrchar(char *s, char from, char to);char *rtrim (char *s); -static inline char *trim (char *s) -{ -return skip_spaces (rtrim (s)); -} -char *asprintf_expr_inout_ints (const char *var,bool in,size_t nints,int *ints);static inline char *asprintf_expr_in_ints (const char *var,size_t nints,int *ints)