From 0757916e5e17e126cd57be0f9d7810de37cc01c8 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Tue, 29 Oct 2019 15:45:09 -0400 Subject: [PATCH] Cleanup: src.ctf.lttng-live: NULL check already done in `_is_canceled()` func Signed-off-by: Francis Deslauriers Change-Id: I85e4638a326a04889bc6cf5f491fdab8884047ef Reviewed-on: https://review.lttng.org/c/babeltrace/+/2305 Tested-by: jenkins Reviewed-by: Simon Marchi --- src/plugins/ctf/lttng-live/lttng-live.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/plugins/ctf/lttng-live/lttng-live.c b/src/plugins/ctf/lttng-live/lttng-live.c index 1ea60733..af7237bd 100644 --- a/src/plugins/ctf/lttng-live/lttng-live.c +++ b/src/plugins/ctf/lttng-live/lttng-live.c @@ -274,9 +274,8 @@ void lttng_live_destroy_session(struct lttng_live_session *session) BT_COMP_LOGD("Destroy lttng live session"); if (session->id != -1ULL) { if (lttng_live_detach_session(session)) { - if (session->lttng_live_msg_iter && - !lttng_live_graph_is_canceled( - session->lttng_live_msg_iter)) { + if (!lttng_live_graph_is_canceled( + session->lttng_live_msg_iter)) { /* Old relayd cannot detach sessions. */ BT_COMP_LOGD("Unable to detach lttng live session %" PRIu64, session->id); @@ -442,8 +441,7 @@ enum lttng_live_iterator_status lttng_live_get_session( if (!session->attached) { ret = lttng_live_attach_session(session); if (ret) { - if (lttng_live_msg_iter && lttng_live_graph_is_canceled( - lttng_live_msg_iter)) { + if (lttng_live_graph_is_canceled(lttng_live_msg_iter)) { status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN; } else { status = LTTNG_LIVE_ITERATOR_STATUS_ERROR; -- 2.34.1