leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Suggested-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Acked-by: Steven 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2013-12-03 14:09:36 +01:00 committed by Arnaldo Carvalho de Melo
parent 9437147373
commit f9bb36afb2
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/lib/traceevent/event-plugin.c
View File

@ -47,7 +47,11 @@ load_plugin(struct pevent *pevent, const char *path,
char *plugin; char *plugin;
void *handle; 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); strcpy(plugin, path);
strcat(plugin, "/"); strcat(plugin, "/");
@ -71,7 +75,12 @@ load_plugin(struct pevent *pevent, const char *path,
goto out_free; 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->next = *plugin_list;
list->handle = handle; list->handle = handle;
list->name = plugin; list->name = plugin;
@ -163,7 +172,11 @@ load_plugins(struct pevent *pevent, const char *suffix,
if (!home) if (!home)
return; 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); strcpy(path, home);
strcat(path, "/"); strcat(path, "/");