diff options
-rw-r--r-- | tools/perf/util/sort.c | 6 | ||||
-rw-r--r-- | tools/perf/util/sort.h | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 0f5a0a496bc4..7a2fbd8855b7 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c | |||
@@ -12,8 +12,6 @@ int sort__branch_mode = -1; /* -1 = means not set */ | |||
12 | 12 | ||
13 | enum sort_type sort__first_dimension; | 13 | enum sort_type sort__first_dimension; |
14 | 14 | ||
15 | char * field_sep; | ||
16 | |||
17 | LIST_HEAD(hist_entry__sort_list); | 15 | LIST_HEAD(hist_entry__sort_list); |
18 | 16 | ||
19 | static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...) | 17 | static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...) |
@@ -23,11 +21,11 @@ static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...) | |||
23 | 21 | ||
24 | va_start(ap, fmt); | 22 | va_start(ap, fmt); |
25 | n = vsnprintf(bf, size, fmt, ap); | 23 | n = vsnprintf(bf, size, fmt, ap); |
26 | if (field_sep && n > 0) { | 24 | if (symbol_conf.field_sep && n > 0) { |
27 | char *sep = bf; | 25 | char *sep = bf; |
28 | 26 | ||
29 | while (1) { | 27 | while (1) { |
30 | sep = strchr(sep, *field_sep); | 28 | sep = strchr(sep, *symbol_conf.field_sep); |
31 | if (sep == NULL) | 29 | if (sep == NULL) |
32 | break; | 30 | break; |
33 | *sep = '.'; | 31 | *sep = '.'; |
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h index e724b26acd51..e459c981b039 100644 --- a/tools/perf/util/sort.h +++ b/tools/perf/util/sort.h | |||
@@ -32,7 +32,6 @@ extern const char default_sort_order[]; | |||
32 | extern int sort__need_collapse; | 32 | extern int sort__need_collapse; |
33 | extern int sort__has_parent; | 33 | extern int sort__has_parent; |
34 | extern int sort__branch_mode; | 34 | extern int sort__branch_mode; |
35 | extern char *field_sep; | ||
36 | extern struct sort_entry sort_comm; | 35 | extern struct sort_entry sort_comm; |
37 | extern struct sort_entry sort_dso; | 36 | extern struct sort_entry sort_dso; |
38 | extern struct sort_entry sort_sym; | 37 | extern struct sort_entry sort_sym; |