Commit 9e9e5dfd authored Mar 19, 2014 by Namhyung Kim Committed by Jiri Olsa Apr 14, 2014

tools lib traceevent: Do not call warning() directly



The patch 3a3ffa2e ("tools lib traceevent: Report better error
message on bad function args") added the error message but it seems
there's no reason to call warning() directly.

So change it to do_warning_event() to provide event information too.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1395192174-26273-2-git-send-email-namhyung@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Jiri Olsa <jolsa@redhat.com>

parent 3388cc3e

tools/lib/traceevent/event-parse.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -2742,14 +2742,16 @@ process_func_handler(struct event_format *event, struct pevent_function_handler
		type = process_arg(event, farg, &token);
		if (i < (func->nr_args - 1)) {
		if (type != EVENT_DELIM \|\| strcmp(token, ",") != 0) {
		warning("Error: function '%s()' expects %d arguments but event %s only uses %d",
		do_warning_event(event,
		"Error: function '%s()' expects %d arguments but event %s only uses %d",
		func->name, func->nr_args,
		event->name, i + 1);
		goto err;
		}
		} else {
		if (type != EVENT_DELIM \|\| strcmp(token, ")") != 0) {
		warning("Error: function '%s()' only expects %d arguments but event %s has more",
		do_warning_event(event,
		"Error: function '%s()' only expects %d arguments but event %s has more",
		func->name, func->nr_args, event->name);
		goto err;
		}

Admin message