[lttng-dev] [PATCH lttng-tools] Fix: remove logically dead code in send_channel_uid_to_ust

[lttng-dev] [PATCH lttng-tools] Fix: remove logically dead code in send_channel_uid_to_ust

[Jérémie Galarneau]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1633 bytes --]

Merged, thanks!

Jérémie

On Tue, May 17, 2016 at 12:31 PM, Mathieu Desnoyers
<mathieu.desnoyers at efficios.com> wrote:
> Found by Coverity:
>
> at_most: At condition ret < 0, the value of ret must be at most -1.
>     cannot_set: At condition ret < 0, the value of ret cannot be equal
> to any of {-1030, -32}.
>     dead_error_condition: The condition ret < 0 must be true.
> 2825                        } else if (ret < 0) {
> 2826                                goto error_stream_unlock;
> 2827                        }
>     CID 1323135 (#1 of 1): Logically dead code
> (DEADCODE)dead_error_line: Execution cannot reach this statement: goto
> error_stream_unlock;.
>
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> ---
>  src/bin/lttng-sessiond/ust-app.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
> index 1bb183d..48b1adc 100644
> --- a/src/bin/lttng-sessiond/ust-app.c
> +++ b/src/bin/lttng-sessiond/ust-app.c
> @@ -2822,8 +2822,6 @@ static int send_channel_uid_to_ust(struct buffer_reg_channel *reg_chan,
>                         if (ret == -EPIPE || ret == -LTTNG_UST_ERR_EXITING) {
>                                 ret = -ENOTCONN; /* Caused by app exiting. */
>                                 goto error_stream_unlock;
> -                       } else if (ret < 0) {
> -                               goto error_stream_unlock;
>                         }
>                         goto error_stream_unlock;
>                 }
> --
> 2.1.4
>



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com