On Mon, 9 Dec 2013 12:03:50 +0100, Jiri Olsa wrote: > On Mon, Dec 09, 2013 at 02:34:03PM +0900, Namhyung Kim wrote: >> Make it return -2 to distinguish malloc allocation failure. >> >> Signed-off-by: Namhyung Kim <namhy...@kernel.org> >> --- >> tools/lib/traceevent/parse-filter.c | 17 ++++++++++++++--- >> 1 file changed, 14 insertions(+), 3 deletions(-) >> >> diff --git a/tools/lib/traceevent/parse-filter.c >> b/tools/lib/traceevent/parse-filter.c >> index e9d17bfcdffd..06e5af9f8fc4 100644 >> --- a/tools/lib/traceevent/parse-filter.c >> +++ b/tools/lib/traceevent/parse-filter.c >> @@ -301,7 +301,10 @@ find_event(struct pevent *pevent, struct event_list >> **events, >> sys_name = NULL; >> } >> >> - reg = malloc_or_die(strlen(event_name) + 3); >> + reg = malloc(strlen(event_name) + 3); >> + if (reg == NULL) >> + return -2; >> + > > I guess we dont need error defines or enums when this is just > static function, but at least please add some comment (description) > of return values like in pevent_filter_match function
Well, probably we can pass the error_str to find_event(). For comments, I think we only add a formal comment on the external APIs. So it'll look like this: /* * Returns 0 if succeeded, -1 if not matched or invalid regex, * -2 if memory allocation failed. */ What do you think? Thanks, Namhyung -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
