src.ctf.lttng-live: remove unnecessary assignment in lttng_live_iterator_handle_new_s...

[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 3a882b88070ad574552325650c047152d5f11bce..67ea829719debe20b58675cf636f9316d61d173f 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;
@@ -1876,9 +1874,8 @@ end:
 }
 
 static struct bt_param_validation_map_value_entry_descr list_sessions_params[] = {
-    {URL_PARAM,
-     BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_MANDATORY,
-     {bt_param_validation_value_descr::string_t}},
+    {URL_PARAM, BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_MANDATORY,
+     bt_param_validation_value_descr::makeString()},
     BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_END};
 
 static bt_component_class_query_method_status
@@ -2086,9 +2083,8 @@ parse_session_not_found_action_param(const bt_value *no_session_param)
     return action;
 }
 
-static bt_param_validation_value_descr inputs_elem_descr {
-    bt_param_validation_value_descr::string_t,
-};
+static bt_param_validation_value_descr inputs_elem_descr =
+    bt_param_validation_value_descr::makeString();
 
 static const char *sess_not_found_action_choices[] = {
     SESS_NOT_FOUND_ACTION_CONTINUE_STR,
@@ -2097,12 +2093,10 @@ static const char *sess_not_found_action_choices[] = {
 };
 
 static struct bt_param_validation_map_value_entry_descr params_descr[] = {
-    {INPUTS_PARAM,
-     BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_MANDATORY,
-     {bt_param_validation_value_descr::array_t, 1, 1, inputs_elem_descr}},
-    {SESS_NOT_FOUND_ACTION_PARAM,
-     BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL,
-     {bt_param_validation_value_descr::string_t, sess_not_found_action_choices}},
+    {INPUTS_PARAM, BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_MANDATORY,
+     bt_param_validation_value_descr::makeArray(1, 1, inputs_elem_descr)},
+    {SESS_NOT_FOUND_ACTION_PARAM, BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL,
+     bt_param_validation_value_descr::makeString(sess_not_found_action_choices)},
     BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_END};
 
 static bt_component_class_initialize_method_status