* [lttng-dev] [PATCH lttng-tools] Refactor: remove logically dead code
@ 2019-09-20 15:40 Jonathan Rajotte
2019-09-20 21:22 ` Jérémie Galarneau
0 siblings, 1 reply; 2+ messages in thread
From: Jonathan Rajotte @ 2019-09-20 15:40 UTC (permalink / raw)
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
^ permalink raw reply [flat|nested] 2+ messages in thread* [lttng-dev] [PATCH lttng-tools] Refactor: remove logically dead code
2019-09-20 15:40 [lttng-dev] [PATCH lttng-tools] Refactor: remove logically dead code Jonathan Rajotte
@ 2019-09-20 21:22 ` Jérémie Galarneau
0 siblings, 0 replies; 2+ messages in thread
From: Jérémie Galarneau @ 2019-09-20 21:22 UTC (permalink / raw)
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-20 21:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-20 15:40 [lttng-dev] [PATCH lttng-tools] Refactor: remove logically dead code Jonathan Rajotte
2019-09-20 21:22 ` Jérémie Galarneau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox