From mboxrd@z Thu Jan 1 00:00:00 1970 From: nils@as68123.uab.ericsson.se (Nils Carlson) Date: Mon, 6 Sep 2010 16:05:50 +0200 (CEST) Subject: [ltt-dev] [PATCH 2/2] Fix retval value assignment on error In-Reply-To: <20100903184740.GC3324@Krystal> References: <1283531871-10001-1-git-send-email-david.goulet@polymtl.ca> <1283531871-10001-2-git-send-email-david.goulet@polymtl.ca> <20100903184740.GC3324@Krystal> Message-ID: Applied, thanks. /Nils On Fri, 3 Sep 2010, Mathieu Desnoyers wrote: > * David Goulet (david.goulet at polymtl.ca) wrote: >> Signed-off-by: David Goulet > > Acked-by: Mathieu Desnoyers > >> --- >> libust/tracectl.c | 11 +++++++++++ >> 1 files changed, 11 insertions(+), 0 deletions(-) >> >> diff --git a/libust/tracectl.c b/libust/tracectl.c >> index 1bb841f..909cbe8 100644 >> --- a/libust/tracectl.c >> +++ b/libust/tracectl.c >> @@ -282,12 +282,14 @@ static int do_cmd_get_shmid(const char *recvbuf, struct ustcomm_source *src) >> channel_and_cpu = nth_token(recvbuf, 1); >> if(channel_and_cpu == NULL) { >> ERR("cannot parse channel"); >> + retval = -1; >> goto end; >> } >> >> seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); >> if(ch_cpu == -1) { >> ERR("problem parsing channel name"); >> + retval = -1; >> goto free_short_chan_name; >> } >> >> @@ -360,12 +362,14 @@ static int do_cmd_get_n_subbufs(const char *recvbuf, struct ustcomm_source *src) >> channel_and_cpu = nth_token(recvbuf, 1); >> if(channel_and_cpu == NULL) { >> ERR("cannot parse channel"); >> + retval = -1; >> goto end; >> } >> >> seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); >> if(ch_cpu == -1) { >> ERR("problem parsing channel name"); >> + retval = -1; >> goto free_short_chan_name; >> } >> >> @@ -434,12 +438,14 @@ static int do_cmd_get_subbuf_size(const char *recvbuf, struct ustcomm_source *sr >> channel_and_cpu = nth_token(recvbuf, 1); >> if(channel_and_cpu == NULL) { >> ERR("cannot parse channel"); >> + retval = -1; >> goto end; >> } >> >> seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); >> if(ch_cpu == -1) { >> ERR("problem parsing channel name"); >> + retval = -1; >> goto free_short_chan_name; >> } >> >> @@ -522,6 +528,7 @@ static int do_cmd_set_subbuf_size(const char *recvbuf, struct ustcomm_source *sr >> >> if(ch_name == NULL) { >> ERR("cannot parse channel"); >> + retval = -1; >> goto end; >> } >> >> @@ -577,10 +584,12 @@ static int do_cmd_set_subbuf_num(const char *recvbuf, struct ustcomm_source *src >> >> if(ch_name == NULL) { >> ERR("cannot parse channel"); >> + retval = -1; >> goto end; >> } >> if (num < 2) { >> ERR("subbuffer count should be greater than 2"); >> + retval = -1; >> goto end; >> } >> >> @@ -629,12 +638,14 @@ static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src) >> channel_and_cpu = nth_token(recvbuf, 1); >> if(channel_and_cpu == NULL) { >> ERR("cannot parse channel"); >> + retval = -1; >> goto end; >> } >> >> seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); >> if(ch_cpu == -1) { >> ERR("problem parsing channel name"); >> + retval = -1; >> goto free_short_chan_name; >> } >> >> -- >> 1.7.0.4 >> >> >> _______________________________________________ >> ltt-dev mailing list >> ltt-dev at lists.casi.polymtl.ca >> http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev >> > > -- > Mathieu Desnoyers > Operating System Efficiency R&D Consultant > EfficiOS Inc. > http://www.efficios.com > > _______________________________________________ > ltt-dev mailing list > ltt-dev at lists.casi.polymtl.ca > http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev >