Fix: src.ctf.lttng-live: return correct error status in lttng_live_msg_iter_init

[babeltrace.git] / src / plugins / ctf / lttng-live / lttng-live.cpp

diff --git a/src/plugins/ctf/lttng-live/lttng-live.cpp b/src/plugins/ctf/lttng-live/lttng-live.cpp
index 344fbe27c17441fa88b4b94403f9cc48b3cb2c70..63fc173f689cd20f956ba2ba6810cf3e6bc7fa8e 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.cpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.cpp
@@ -607,9 +607,7 @@ lttng_live_iterator_handle_new_streams_and_metadata(struct lttng_live_msg_iter *
         status = lttng_live_get_session(lttng_live_msg_iter, session);
         switch (status) {
         case LTTNG_LIVE_ITERATOR_STATUS_OK:
-            break;
         case LTTNG_LIVE_ITERATOR_STATUS_END:
-            status = LTTNG_LIVE_ITERATOR_STATUS_OK;
             break;
         default:
             goto end;
@@ -1799,8 +1797,8 @@ lttng_live_msg_iter_init(bt_self_message_iterator *self_msg_it,
 
     lttng_live_msg_iter = lttng_live_msg_iter_create(lttng_live, self_msg_it);
     if (!lttng_live_msg_iter) {
-        status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
         BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Failed to create lttng_live_msg_iter");
+        status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
         goto error;
     }
 
@@ -1817,6 +1815,8 @@ lttng_live_msg_iter_init(bt_self_message_iterator *self_msg_it,
              */
             BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Interrupted while creating viewer connection");
         }
+
+        status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
         goto error;
     }
 
@@ -1831,6 +1831,8 @@ lttng_live_msg_iter_init(bt_self_message_iterator *self_msg_it,
              */
             BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Interrupted when creating viewer session");
         }
+
+        status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
         goto error;
     }
 
@@ -1850,6 +1852,7 @@ lttng_live_msg_iter_init(bt_self_message_iterator *self_msg_it,
                 "component parameter: url =\"%s\"",
                 SESS_NOT_FOUND_ACTION_PARAM, SESS_NOT_FOUND_ACTION_FAIL_STR,
                 lttng_live->params.url->str);
+            status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
             goto error;
         case SESSION_NOT_FOUND_ACTION_END:
             BT_COMP_LOGI(
@@ -1869,7 +1872,6 @@ lttng_live_msg_iter_init(bt_self_message_iterator *self_msg_it,
     goto end;
 
 error:
-    status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
     lttng_live_msg_iter_destroy(lttng_live_msg_iter);
 end:
     return status;