Make some bt_param_validation_map_value_entry_descr variables static

[babeltrace.git] / src / plugins / text / pretty / pretty.c

diff --git a/src/plugins/text/pretty/pretty.c b/src/plugins/text/pretty/pretty.c
index 3ea6c54ad4be2316d99ebd93c2db34ee52c7bbe9..b05622bda44880572121c26c09d3e8851c24d052 100644 (file)
--- a/src/plugins/text/pretty/pretty.c
+++ b/src/plugins/text/pretty/pretty.c
@@ -116,7 +116,7 @@ bt_component_class_message_iterator_next_method_status handle_message(
        bt_component_class_message_iterator_next_method_status ret =
                BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
 
-       BT_ASSERT(pretty);
+       BT_ASSERT_DBG(pretty);
 
        switch (bt_message_get_type(message)) {
        case BT_MESSAGE_TYPE_EVENT:
@@ -199,7 +199,7 @@ bt_component_class_sink_consume_method_status pretty_consume(
                goto end;
        }
 
-       BT_ASSERT(next_status == BT_MESSAGE_ITERATOR_NEXT_STATUS_OK);
+       BT_ASSERT_DBG(next_status == BT_MESSAGE_ITERATOR_NEXT_STATUS_OK);
 
        for (i = 0; i < count; i++) {
                ret = (int) handle_message(pretty, msgs[i]);
@@ -296,6 +296,7 @@ end:
 static const char *color_choices[] = { "never", "auto", "always", NULL };
 static const char *show_hide_choices[] = { "show", "hide", NULL };
 
+static
 struct bt_param_validation_map_value_entry_descr pretty_params[] = {
        { "color", BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL, { BT_VALUE_TYPE_STRING, .string = {
                .choices = color_choices,
@@ -430,7 +431,7 @@ bt_component_class_initialize_method_status apply_params(
                pretty->options.print_scope_field_names = false;
                break;
        default:
-               abort();
+               bt_common_abort();
        }
 
        apply_one_bool_if_specified("name-payload", params,
@@ -492,7 +493,7 @@ bt_component_class_initialize_method_status apply_params(
                pretty->options.print_callsite_field = false;
                break;
        default:
-               abort();
+               bt_common_abort();
        }
 
        apply_one_bool_if_specified("field-trace", params,
@@ -519,6 +520,7 @@ bt_component_class_initialize_method_status apply_params(
        apply_one_bool_if_specified("field-callsite", params,
                &pretty->options.print_callsite_field);
 
+       pretty_print_init();
        status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
 
 end: