Make some bt_param_validation_map_value_entry_descr variables static

[babeltrace.git] / src / plugins / utils / trimmer / trimmer.c

diff --git a/src/plugins/utils/trimmer/trimmer.c b/src/plugins/utils/trimmer/trimmer.c
index 889845a1d6fdde2ccb7cb1f53151625fe138cc57..75104b31df9dc8e3b6f246c4b8ab9c31229e743b 100644 (file)
--- a/src/plugins/utils/trimmer/trimmer.c
+++ b/src/plugins/utils/trimmer/trimmer.c
@@ -30,6 +30,7 @@
 #include <babeltrace2/babeltrace.h>
 #include "common/common.h"
 #include "common/assert.h"
+#include <stdbool.h>
 #include <stdint.h>
 #include <inttypes.h>
 #include <glib.h>
@@ -526,6 +527,7 @@ enum bt_param_validation_status validate_bound_type(
        return status;
 }
 
+static
 struct bt_param_validation_map_value_entry_descr trimmer_params[] = {
        { "gmt", BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL, { .type = BT_VALUE_TYPE_BOOL } },
        { "begin", BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL, { .validation_func = validate_bound_type } },
@@ -974,8 +976,6 @@ state_set_trimmer_iterator_bounds(
                for (i = 0; i < count; i++) {
                        const bt_message *msg = msgs[i];
                        bool has_ns_from_origin;
-                       int ret;
-
                        ret = get_msg_ns_from_origin(msg, &ns_from_origin,
                                &has_ns_from_origin);
                        if (ret) {
@@ -1935,7 +1935,7 @@ bt_component_class_message_iterator_next_method_status trimmer_msg_iter_next(
                        status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END;
                        break;
                default:
-                       abort();
+                       bt_common_abort();
                }
        }