Re: [PATCH 22/28] tools lib traceevent: Remove malloc_or_die fromevent-plugin.c

[Steven Rostedt]

On Tue,  3 Dec 2013 14:09:36 +0100
Jiri Olsa <jolsa@xxxxxxxxxx> wrote:

> Removing malloc_or_die calls from event-plugin.c,
> replacing them with standard malloc and error path.
> 
> Suggested-by: Namhyung Kim <namhyung@xxxxxxxxxx>
> Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> Cc: Corey Ashford <cjashfor@xxxxxxxxxxxxxxxxxx>
> Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxx>
> Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
> Cc: Paul Mackerras <paulus@xxxxxxxxx>
> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
> Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxxxx>
> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
> Cc: David Ahern <dsahern@xxxxxxxxx>
> ---
>  tools/lib/traceevent/event-plugin.c | 19 ++++++++++++++++---
>  1 file changed, 16 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/lib/traceevent/event-plugin.c b/tools/lib/traceevent/event-plugin.c
> index d272d87..125f567 100644
> --- a/tools/lib/traceevent/event-plugin.c
> +++ b/tools/lib/traceevent/event-plugin.c
> @@ -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;

This should be changed to return an error code. Yes it will require
other places to change for that update as well.

-- Steve

> +	}
>  
>  	strcpy(plugin, path);
>  	strcat(plugin, "/");
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/