From: Mathieu Desnoyers Date: Tue, 17 May 2016 16:31:23 +0000 (-0400) Subject: Fix: remove logically dead code in send_channel_uid_to_ust X-Git-Tag: v2.6.3~25 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=3d6b79e3c39668bb66eeee499226239d0ac9e5c7;p=lttng-tools.git Fix: remove logically dead code in send_channel_uid_to_ust 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 Signed-off-by: Jérémie Galarneau --- diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c index e0983b041..df52f491f 100644 --- a/src/bin/lttng-sessiond/ust-app.c +++ b/src/bin/lttng-sessiond/ust-app.c @@ -2606,9 +2606,6 @@ static int send_channel_uid_to_ust(struct buffer_reg_channel *reg_chan, (void) release_ust_app_stream(-1, &stream, app); 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; }