Commit 91dfa49b authored Dec 12, 2013 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Dec 13, 2013

tools lib traceevent: Get rid of malloc_or_die() in read_token()



Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-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/1386833777-3790-5-git-send-email-namhyung@kernel.org


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

parent 2e4eb10d

tools/lib/traceevent/parse-filter.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,11 @@ static enum event_type read_token(char **tok)
		(strcmp(token, "=") == 0 \|\| strcmp(token, "!") == 0) &&
		pevent_peek_char() == '~') {
		/* append it */
		*tok = malloc_or_die(3);
		*tok = malloc(3);
		if (*tok == NULL) {
		free_token(token);
		return EVENT_ERROR;
		}
		sprintf(tok, "%c%c", token, '~');
		free_token(token);
		/* Now remove the '~' from the buffer */
		@@ -1123,6 +1127,8 @@ process_filter(struct event_format event, struct filter_arg *parg,
		break;
		case EVENT_NONE:
		break;
		case EVENT_ERROR:
		goto fail_alloc;
		default:
		goto fail_print;
		}