Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9bb36af authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

tools lib traceevent: Remove malloc_or_die from event-plugin.c 



Removing malloc_or_die calls from event-plugin.c,
replacing them with standard malloc and error path.

Suggested-by: default avatarNamhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1386076182-14484-23-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 94371473

tools/lib/traceevent/event-plugin.c

+16 −3
Original line number Diff line number Diff line
@@ -47,7 +47,11 @@ load_plugin(struct pevent *pevent, const char *path, 
	char *plugin;

	void *handle;



	plugin = malloc_or_die(strlen(path) + strlen(file) + 2);

	plugin = malloc(strlen(path) + strlen(file) + 2);

	if (!plugin) {

		warning("could not allocate plugin memory\n");

		return;

	}



	strcpy(plugin, path);

	strcat(plugin, "/");
@@ -71,7 +75,12 @@ load_plugin(struct pevent *pevent, const char *path, 
		goto out_free;

	}



	list = malloc_or_die(sizeof(*list));

	list = malloc(sizeof(*list));

	if (!list) {

		warning("could not allocate plugin memory\n");

		goto out_free;

	}



	list->next = *plugin_list;

	list->handle = handle;

	list->name = plugin;
@@ -163,7 +172,11 @@ load_plugins(struct pevent *pevent, const char *suffix, 
	if (!home)

		return;



	path = malloc_or_die(strlen(home) + strlen(LOCAL_PLUGIN_DIR) + 2);

	path = malloc(strlen(home) + strlen(LOCAL_PLUGIN_DIR) + 2);

	if (!path) {

		warning("could not allocate plugin memory\n");

		return;

	}



	strcpy(path, home);

	strcat(path, "/");