From mboxrd@z Thu Jan  1 00:00:00 1970
From: jeremie.galarneau@efficios.com (=?iso-8859-1?Q?J=E9r=E9mie?= Galarneau)
Date: Fri, 20 Sep 2019 17:22:38 -0400
Subject: [lttng-dev] [PATCH lttng-tools] Refactor: remove logically dead
 code
In-Reply-To: <20190920154037.74966-1-jonathan.rajotte-julien@efficios.com>
References: <20190920154037.74966-1-jonathan.rajotte-julien@efficios.com>
Message-ID: <20190920212238.GA20024@gmail.com>

Merged in master and stable-2.11. Thanks!

J?r?mie

On Fri, Sep 20, 2019 at 11:40:37AM -0400, Jonathan Rajotte wrote:
> Fixes coverity #1400681
> 
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
> ---
>  src/common/session-descriptor.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/src/common/session-descriptor.c b/src/common/session-descriptor.c
> index 208eb46ff..713731c3e 100644
> --- a/src/common/session-descriptor.c
> +++ b/src/common/session-descriptor.c
> @@ -550,14 +550,8 @@ lttng_session_descriptor_live_create(
>  	struct lttng_session_descriptor_live *descriptor;
>  
>  	descriptor = _lttng_session_descriptor_live_create(name, live_timer_us);
> -	if (!descriptor) {
> -		goto error;
> -	}
>  
>  	return descriptor ? &descriptor->base : NULL;
> -error:
> -	lttng_session_descriptor_destroy(descriptor ? &descriptor->base : NULL);
> -	return NULL;
>  }
>  
>  struct lttng_session_descriptor *
> -- 
> 2.17.1
>