src.ctf.fs: add status conversion function
authorSimon Marchi <simon.marchi@efficios.com>
Wed, 19 Jan 2022 22:20:28 +0000 (17:20 -0500)
committerPhilippe Proulx <eeppeliteloop@gmail.com>
Fri, 28 Jan 2022 16:22:26 +0000 (11:22 -0500)
The line changed, in bt_message_iterator_class_initialize_method_status,
converts a ctf_msg_iter_medium_status to a
bt_message_iterator_class_initialize_method_status using a direct cast.
However, there is not a 1:1 mapping between the two enums.  There are
values in the source that are not valid in the destination.

Replace the int cast with a dedicated conversion method.

Change-Id: Iad24a87bb3926ea9191ca00e18e13df933807f65
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/7094
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
src/plugins/ctf/fs-src/fs.c

index 42956c22bf9fb38ed40299727c815f429175bcd0..ac3bdb31e73d28002f946e3717fb106105814dfb 100644 (file)
@@ -189,6 +189,25 @@ void ctf_fs_iterator_finalize(bt_self_message_iterator *it)
                bt_self_message_iterator_get_data(it));
 }
 
+static
+bt_message_iterator_class_initialize_method_status
+ctf_msg_iter_medium_status_to_msg_iter_initialize_status
+       (enum ctf_msg_iter_medium_status status)
+{
+       switch (status) {
+       case CTF_MSG_ITER_MEDIUM_STATUS_EOF:
+       case CTF_MSG_ITER_MEDIUM_STATUS_AGAIN:
+       case CTF_MSG_ITER_MEDIUM_STATUS_ERROR:
+               return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
+       case CTF_MSG_ITER_MEDIUM_STATUS_MEMORY_ERROR:
+               return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
+       case CTF_MSG_ITER_MEDIUM_STATUS_OK:
+               return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
+       }
+
+       bt_common_abort();
+}
+
 BT_HIDDEN
 bt_message_iterator_class_initialize_method_status ctf_fs_iterator_init(
                bt_self_message_iterator *self_msg_iter,
@@ -229,7 +248,7 @@ bt_message_iterator_class_initialize_method_status ctf_fs_iterator_init(
        if (medium_status != CTF_MSG_ITER_MEDIUM_STATUS_OK) {
                BT_MSG_ITER_LOGE_APPEND_CAUSE(self_msg_iter,
                        "Failed to create ctf_fs_ds_group_medops");
-               status = (int) medium_status;
+               status = ctf_msg_iter_medium_status_to_msg_iter_initialize_status(medium_status);
                goto error;
        }
 
This page took 0.026206 seconds and 4 git commands to generate.