Fix: common: handle missing status in bt_common_func_status_string
authorSimon Marchi <simon.marchi@efficios.com>
Fri, 11 Mar 2022 01:16:47 +0000 (20:16 -0500)
committerPhilippe Proulx <eeppeliteloop@gmail.com>
Wed, 15 Jun 2022 18:29:50 +0000 (14:29 -0400)
bt_common_func_status_string does not handle __BT_FUNC_STATUS_NO_MATCH,
trying to use it leads to an abort.

Add it, and reorder the cases to be in the same order as the statuses
are listed in include/babeltrace2/func-status.h, to make it easier to
see that none is missing.

Change-Id: I1c1da11b0e9a0694c96b67a4d1e6efb8e4da55d7
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/7564
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
src/common/common.h

index 46e6a1a1b293e330b18c3eaf22b336021310a1db..2c9ef3825c6a648addc5eca1ae5d669df845d31d 100644 (file)
@@ -719,8 +719,6 @@ const char *bt_common_func_status_string(int status)
        switch (status) {
        case __BT_FUNC_STATUS_OVERFLOW_ERROR:
                return "OVERFLOW";
-       case __BT_FUNC_STATUS_UNKNOWN_OBJECT:
-               return "UNKNOWN_OBJECT";
        case __BT_FUNC_STATUS_MEMORY_ERROR:
                return "MEMORY_ERROR";
        case __BT_FUNC_STATUS_USER_ERROR:
@@ -733,10 +731,14 @@ const char *bt_common_func_status_string(int status)
                return "END";
        case __BT_FUNC_STATUS_NOT_FOUND:
                return "NOT_FOUND";
-       case __BT_FUNC_STATUS_AGAIN:
-               return "AGAIN";
        case __BT_FUNC_STATUS_INTERRUPTED:
                return "INTERRUPTED";
+       case __BT_FUNC_STATUS_NO_MATCH:
+               return "NO_MATCH";
+       case __BT_FUNC_STATUS_AGAIN:
+               return "AGAIN";
+       case __BT_FUNC_STATUS_UNKNOWN_OBJECT:
+               return "UNKNOWN_OBJECT";
        }
 
        bt_common_abort();
This page took 0.02495 seconds and 4 git commands to generate.