* [tip:perf/core] perf callchains: Switch from strtok() to strtok_r() when parsing options
@ 2017-04-12 5:33 tip-bot for Arnaldo Carvalho de Melo
0 siblings, 0 replies; only message in thread
From: tip-bot for Arnaldo Carvalho de Melo @ 2017-04-12 5:33 UTC (permalink / raw)
To: linux-tip-commits; +Cc: mingo, tglx, acme, namhyung, linux-kernel, hpa
Commit-ID: dadafc315ded31a36cb4899bc85ef4050f0332a7
Gitweb: http://git.kernel.org/tip/dadafc315ded31a36cb4899bc85ef4050f0332a7
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Wed, 5 Apr 2017 11:38:10 -0300
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 11 Apr 2017 08:45:09 -0300
perf callchains: Switch from strtok() to strtok_r() when parsing options
Trying to keep everything reentrant.
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/n/tip-rdce0p2k9e1b4qnrb8ki9mtf@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/callchain.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 3cea1fb..2e5eff5 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -116,7 +116,7 @@ static int
__parse_callchain_report_opt(const char *arg, bool allow_record_opt)
{
char *tok;
- char *endptr;
+ char *endptr, *saveptr = NULL;
bool minpcnt_set = false;
bool record_opt_set = false;
bool try_stack_size = false;
@@ -127,7 +127,7 @@ __parse_callchain_report_opt(const char *arg, bool allow_record_opt)
if (!arg)
return 0;
- while ((tok = strtok((char *)arg, ",")) != NULL) {
+ while ((tok = strtok_r((char *)arg, ",", &saveptr)) != NULL) {
if (!strncmp(tok, "none", strlen(tok))) {
callchain_param.mode = CHAIN_NONE;
callchain_param.enabled = false;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-04-12 5:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-12 5:33 [tip:perf/core] perf callchains: Switch from strtok() to strtok_r() when parsing options tip-bot for Arnaldo Carvalho de Melo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.