From a6804e9483d50ec9a6e25d933b98cd3438077e0c Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 10 Mar 2022 20:16:47 -0500 Subject: [PATCH] Fix: common: handle missing status in bt_common_func_status_string 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 Reviewed-on: https://review.lttng.org/c/babeltrace/+/7564 Tested-by: jenkins Reviewed-by: Philippe Proulx --- src/common/common.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common/common.h b/src/common/common.h index 46e6a1a1..2c9ef382 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -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(); -- 2.34.1