[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-93aaa45a6ad3f983180223601fc663cc551ad499@git.kernel.org>
Date: Wed, 2 Dec 2009 10:44:25 GMT
From: tip-bot for Liming Wang <liming.wang@...driver.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
fweisbec@...il.com, tglx@...utronix.de, liming.wang@...driver.com,
mingo@...e.hu
Subject: [tip:perf/core] perf tools: Replace %m with %a in sscanf
Commit-ID: 93aaa45a6ad3f983180223601fc663cc551ad499
Gitweb: http://git.kernel.org/tip/93aaa45a6ad3f983180223601fc663cc551ad499
Author: Liming Wang <liming.wang@...driver.com>
AuthorDate: Wed, 2 Dec 2009 16:42:54 +0800
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Wed, 2 Dec 2009 10:12:16 +0100
perf tools: Replace %m with %a in sscanf
Not all glibc support %m and it results in a compile error if
%m not supported. Replace it with %a and (float *) casts.
Signed-off-by: Liming Wang <liming.wang@...driver.com>
Acked-by: Frederic Weisbecker <fweisbec@...il.com>
Cc: peterz@...radead.org
Cc: mhiramat@...hat.com
LKML-Reference: <1259743374-9950-1-git-send-email-liming.wang@...driver.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
tools/perf/util/probe-event.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index e42f3ac..cd7fbda 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -199,8 +199,8 @@ void parse_trace_kprobe_event(const char *str, char **group, char **event,
semantic_error("Too less arguments.");
/* Scan event and group name. */
- ret = sscanf(argv[0], "%c:%m[^/ \t]/%m[^ \t]",
- &pr, group, event);
+ ret = sscanf(argv[0], "%c:%a[^/ \t]/%a[^ \t]",
+ &pr, (float *)(void *)group, (float *)(void *)event);
if (ret != 3)
semantic_error("Failed to parse event name: %s", argv[0]);
pr_debug("Group:%s Event:%s probe:%c\n", *group, *event, pr);
@@ -211,7 +211,7 @@ void parse_trace_kprobe_event(const char *str, char **group, char **event,
pp->retprobe = (pr == 'r');
/* Scan function name and offset */
- ret = sscanf(argv[1], "%m[^+]+%d", &pp->function, &pp->offset);
+ ret = sscanf(argv[1], "%a[^+]+%d", (float *)(void *)&pp->function, &pp->offset);
if (ret == 1)
pp->offset = 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists