diff options
| author |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-04-05 11:43:41 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-04-11 08:45:09 -0300 |
| commit | 49346e858f34eda103d7c0e85c06edbaebfc83a9 (patch) | |
| tree | 5f7f0e4f5749922ef883e6424e2eebc888832e7b /tools/perf/builtin-script.c | |
| parent | perf callchains: Switch from strtok() to strtok_r() when parsing options (diff) | |
| download | wireguard-linux-49346e858f34eda103d7c0e85c06edbaebfc83a9.tar.xz wireguard-linux-49346e858f34eda103d7c0e85c06edbaebfc83a9.zip | |
perf script: Use strtok_r() when parsing output field list
Just avoiding non-reentrant functions.
Cc: David Ahern <dsahern@gmail.com>
Link: http://lkml.kernel.org/n/tip-eqytykipd74epzl9aexvppcg@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-script.c')
| -rw-r--r-- | tools/perf/builtin-script.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 46acc8ece41f..2dab70fba2ba 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -1708,7 +1708,7 @@ static int parse_scriptname(const struct option *opt __maybe_unused, static int parse_output_fields(const struct option *opt __maybe_unused, const char *arg, int unset __maybe_unused) { - char *tok; + char *tok, *strtok_saveptr = NULL; int i, imax = ARRAY_SIZE(all_output_options); int j; int rc = 0; @@ -1769,7 +1769,7 @@ static int parse_output_fields(const struct option *opt __maybe_unused, } } - for (tok = strtok(tok, ","); tok; tok = strtok(NULL, ",")) { + for (tok = strtok_r(tok, ",", &strtok_saveptr); tok; tok = strtok_r(NULL, ",", &strtok_saveptr)) { for (i = 0; i < imax; ++i) { if (strcmp(tok, all_output_options[i].str) == 0) break; |