[ltt-dev] [UST PATCH] Correct error handling and add error message in ustcmd.c

[nils@as68123.uab.ericsson.se (Nils Carlson)]

Pulled, thanks.

/Nils

On Sat, 11 Sep 2010, Douglas Santos wrote:

> hey Nils,
> Keep your patch with the err message :) thanks.
>
>
> Quoting Nils Carlson <nils.carlson at ludd.ltu.se>:
>
>> Ah,
>>
>> Sorry, missed that one. Need to start sorting e-mails better on
>> subject line... Sorry douglas.
>>
>> Strike mine, I'll comment douglas'.
>>
>> /Nils
>> On Sep 11, 2010, at 6:01 PM, David Goulet wrote:
>>
>>> -----BEGIN PGP SIGNED MESSAGE-----
>>> Hash: SHA1
>>>
>>> I thought so!
>>>
>>> This is the Douglas Santos patch ;)
>>>
>>> This is why I told you to Ack and then start the discussion in two
>>> seperate
>>> emails :P:P
>>>
>>> Cheers
>>> David
>>>
>>> On 10-09-11 11:00 AM, Mathieu Desnoyers wrote:
>>>> * Nils Carlson (nils.carlson at ericsson.com) wrote:
>>>>>
>>>>> Signed-off-by: Nils Carlson <nils.carlson at ericsson.com>
>>>>
>>>> David, Nils, please double-check that you are not fixing the same
>>>> problem twice with slightly different patches. I think I've seen this
>>>> one recently.
>>>>
>>>> Thanks,
>>>>
>>>> Mathieu
>>>>
>>>>
>>>>> ---
>>>>> libustcmd/ustcmd.c |    5 +----
>>>>> 1 files changed, 1 insertions(+), 4 deletions(-)
>>>>>
>>>>> diff --git a/libustcmd/ustcmd.c b/libustcmd/ustcmd.c
>>>>> index 4248072..c512320 100644
>>>>> --- a/libustcmd/ustcmd.c
>>>>> +++ b/libustcmd/ustcmd.c
>>>>> @@ -396,10 +396,6 @@ int ustcmd_get_cmsf(struct marker_status
>>>>> **cmsf, const pid_t pid)
>>>>> 	}
>>>>> 	result = ustcmd_send_cmd("list_markers", pid, &big_str);
>>>>> 	if (result != 1) {
>>>>> -		return -1;
>>>>> -	}
>>>>> -
>>>>> -	if (result != 1) {
>>>>> 		ERR("error while getting markers list");
>>>>> 		return -1;
>>>>> 	}
>>>>> @@ -407,6 +403,7 @@ int ustcmd_get_cmsf(struct marker_status
>>>>> **cmsf, const pid_t pid)
>>>>> 	tmp_cmsf = (struct marker_status *) malloc(sizeof(struct
>>>>> marker_status) *
>>>>> 		(ustcmd_count_nl(big_str) + 1));
>>>>> 	if (tmp_cmsf == NULL) {
>>>>> +		ERR("Failed to allocate CMSF array");
>>>>> 		return -1;
>>>>> 	}
>>>>>
>>>>> --
>>>>> 1.7.1
>>>>>
>>>>>
>>>>> _______________________________________________
>>>>> ltt-dev mailing list
>>>>> ltt-dev at lists.casi.polymtl.ca
>>>>> http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev
>>>>>
>>>>
>>>
>>> - --
>>> David Goulet
>>> LTTng project, DORSAL Lab.
>>>
>>> 1024D/16BD8563
>>> BE3C 672B 9331 9796 291A  14C6 4AF7 C14B 16BD 8563
>>> -----BEGIN PGP SIGNATURE-----
>>> Version: GnuPG v1.4.10 (GNU/Linux)
>>>
>>> iEYEARECAAYFAkyLp+wACgkQSvfBSxa9hWMDEwCgq6hMc6phDxw6J1kMTavtocSG
>>> sEkAn3LeMeIrMVKSQH5STkiIOAiSQb0h
>>> =V3Im
>>> -----END PGP SIGNATURE-----
>>>
>>> _______________________________________________
>>> ltt-dev mailing list
>>> ltt-dev at lists.casi.polymtl.ca
>>> http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev
>>
>>
>
>
>
>
> _______________________________________________
> ltt-dev mailing list
> ltt-dev at lists.casi.polymtl.ca
> http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev
>