Re: [PATCH 13/14] tools lib traceevent: Get rid of die() in some string conversion funcitons

[Namhyung Kim]

Hi Arnaldo,

On Thu, 12 Dec 2013 15:41:47 -0300, Arnaldo Carvalho de Melo wrote:
> Em Thu, Dec 12, 2013 at 04:36:16PM +0900, Namhyung Kim escreveu:
>> Those functions are for stringify filter arguments.  As caller of
>> those functions handles NULL string properly, it seems that it's
>> enough to return NULL rather than calling die().
>> 
>> Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
>> ---
>>  tools/lib/traceevent/parse-filter.c | 58 +++++++++++++++++++++++--------------
>>  1 file changed, 36 insertions(+), 22 deletions(-)
>> 
>> diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
>> index 9303c55128db..32ab4396653c 100644
>> --- a/tools/lib/traceevent/parse-filter.c
>> +++ b/tools/lib/traceevent/parse-filter.c
>> @@ -1361,8 +1361,10 @@ enum pevent_errno pevent_filter_add_filter_str(struct event_filter *filter,
>>  		if (ret >= 0 && pevent->test_filters) {
>>  			char *test;
>>  			test = pevent_filter_make_string(filter, event->event->id);
>> -			printf(" '%s: %s'\n", event->event->name, test);
>> -			free(test);
>> +			if (test) {
>> +				printf(" '%s: %s'\n", event->event->name, test);
>> +				free(test);
>> +			}
>>  		}
>>  	}
>>  
>> @@ -2097,7 +2099,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)
>>  				default:
>>  					break;
>>  				}
>> -				str = malloc_or_die(6);
>> +				str = malloc(6);
>> +				if (str == NULL)
>> +					break;
>>  				if (val)
>>  					strcpy(str, "TRUE");
>>  				else
>> @@ -2120,7 +2124,9 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)
>>  		}
>>  
>>  		len = strlen(left) + strlen(right) + strlen(op) + 10;
>> -		str = malloc_or_die(len);
>> +		str = malloc(len);
>> +		if (str == NULL)
>> +			break;
>>  		snprintf(str, len, "(%s) %s (%s)",
>>  			 left, op, right);
>
> Why note:
>
> 		str = NULL;
> 		if (asprintf(&str, "(%s) %s (%s)", left, op, right);
> 			break;
>
> instead?
>
> Ditto for other places here, also there is a typo in the subject line.
>
> I've applied all the previous patches, thanks!

Thank you very much!

Here is the updated patch: