lib: strictly type function return status enumerations

[babeltrace.git] / src / lib / trace-ir / stream-class.c

diff --git a/src/lib/trace-ir/stream-class.c b/src/lib/trace-ir/stream-class.c
index 67b24aad10e5084de0f73cf5bdb8ef4c7138f1fa..7abea88491b456bdba8a7876608c99afd23cadf2 100644 (file)
--- a/src/lib/trace-ir/stream-class.c
+++ b/src/lib/trace-ir/stream-class.c
@@ -21,8 +21,8 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "STREAM-CLASS"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/STREAM-CLASS"
+#include "lib/logging.h"
 
 #include "lib/assert-pre.h"
 #include <babeltrace2/trace-ir/trace-const.h>
@@ -44,6 +44,7 @@
 #include "stream-class.h"
 #include "trace.h"
 #include "utils.h"
+#include "lib/func-status.h"
 
 #define BT_ASSERT_PRE_STREAM_CLASS_HOT(_sc) \
        BT_ASSERT_PRE_HOT((_sc), "Stream class", ": %!+S", (_sc))
@@ -205,7 +206,7 @@ const char *bt_stream_class_get_name(const struct bt_stream_class *stream_class)
        return stream_class->name.value;
 }
 
-enum bt_stream_class_status bt_stream_class_set_name(
+enum bt_stream_class_set_name_status bt_stream_class_set_name(
                struct bt_stream_class *stream_class,
                const char *name)
 {
@@ -214,8 +215,8 @@ enum bt_stream_class_status bt_stream_class_set_name(
        BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
        g_string_assign(stream_class->name.str, name);
        stream_class->name.value = stream_class->name.str->str;
-       BT_LIB_LOGV("Set stream class's name: %!+S", stream_class);
-       return BT_STREAM_CLASS_STATUS_OK;
+       BT_LIB_LOGD("Set stream class's name: %!+S", stream_class);
+       return BT_FUNC_STATUS_OK;
 }
 
 uint64_t bt_stream_class_get_id(const struct bt_stream_class *stream_class)
@@ -293,7 +294,8 @@ bt_stream_class_borrow_packet_context_field_class(
        return stream_class->packet_context_fc;
 }
 
-enum bt_stream_class_status bt_stream_class_set_packet_context_field_class(
+enum bt_stream_class_set_field_class_status
+bt_stream_class_set_packet_context_field_class(
                struct bt_stream_class *stream_class,
                struct bt_field_class *field_class)
 {
@@ -319,7 +321,7 @@ enum bt_stream_class_status bt_stream_class_set_packet_context_field_class(
                 * bt_resolve_field_paths() can fail: anything else
                 * would be because a precondition is not satisfied.
                 */
-               ret = BT_STREAM_CLASS_STATUS_NOMEM;
+               ret = BT_FUNC_STATUS_MEMORY_ERROR;
                goto end;
        }
 
@@ -328,7 +330,7 @@ enum bt_stream_class_status bt_stream_class_set_packet_context_field_class(
        stream_class->packet_context_fc = field_class;
        bt_object_get_no_null_check(stream_class->packet_context_fc);
        bt_field_class_freeze(field_class);
-       BT_LIB_LOGV("Set stream class's packet context field class: %!+S",
+       BT_LIB_LOGD("Set stream class's packet context field class: %!+S",
                stream_class);
 
 end:
@@ -351,7 +353,7 @@ bt_stream_class_borrow_event_common_context_field_class(
        return stream_class->event_common_context_fc;
 }
 
-enum bt_stream_class_status
+enum bt_stream_class_set_field_class_status
 bt_stream_class_set_event_common_context_field_class(
                struct bt_stream_class *stream_class,
                struct bt_field_class *field_class)
@@ -379,7 +381,7 @@ bt_stream_class_set_event_common_context_field_class(
                 * bt_resolve_field_paths() can fail: anything else
                 * would be because a precondition is not satisfied.
                 */
-               ret = BT_STREAM_CLASS_STATUS_NOMEM;
+               ret = BT_FUNC_STATUS_MEMORY_ERROR;
                goto end;
        }
 
@@ -388,7 +390,7 @@ bt_stream_class_set_event_common_context_field_class(
        stream_class->event_common_context_fc = field_class;
        bt_object_get_no_null_check(stream_class->event_common_context_fc);
        bt_field_class_freeze(field_class);
-       BT_LIB_LOGV("Set stream class's event common context field class: %!+S",
+       BT_LIB_LOGD("Set stream class's event common context field class: %!+S",
                stream_class);
 
 end:
@@ -404,7 +406,8 @@ void _bt_stream_class_freeze(const struct bt_stream_class *stream_class)
        ((struct bt_stream_class *) stream_class)->frozen = true;
 }
 
-enum bt_stream_class_status bt_stream_class_set_default_clock_class(
+enum bt_stream_class_set_default_clock_class_status
+bt_stream_class_set_default_clock_class(
                struct bt_stream_class *stream_class,
                struct bt_clock_class *clock_class)
 {
@@ -415,9 +418,9 @@ enum bt_stream_class_status bt_stream_class_set_default_clock_class(
        stream_class->default_clock_class = clock_class;
        bt_object_get_no_null_check(stream_class->default_clock_class);
        bt_clock_class_freeze(clock_class);
-       BT_LIB_LOGV("Set stream class's default clock class: %!+S",
+       BT_LIB_LOGD("Set stream class's default clock class: %!+S",
                stream_class);
-       return BT_STREAM_CLASS_STATUS_OK;
+       return BT_FUNC_STATUS_OK;
 }
 
 struct bt_clock_class *bt_stream_class_borrow_default_clock_class(
@@ -448,7 +451,7 @@ void bt_stream_class_set_assigns_automatic_event_class_id(
        BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
        BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
        stream_class->assigns_automatic_event_class_id = (bool) value;
-       BT_LIB_LOGV("Set stream class's automatic event class ID "
+       BT_LIB_LOGD("Set stream class's automatic event class ID "
                "assignment property: %!+S", stream_class);
 }
 
@@ -468,7 +471,7 @@ void bt_stream_class_set_packets_have_beginning_default_clock_snapshot(
                "Stream class has no default clock class: %!+S", stream_class);
        stream_class->packets_have_beginning_default_clock_snapshot =
                (bool) value;
-       BT_LIB_LOGV("Set stream class's \"packets have default beginning "
+       BT_LIB_LOGD("Set stream class's \"packets have default beginning "
                "clock snapshot\" property: %!+S", stream_class);
 }
 
@@ -488,7 +491,7 @@ void bt_stream_class_set_packets_have_end_default_clock_snapshot(
                "Stream class has no default clock class: %!+S", stream_class);
        stream_class->packets_have_end_default_clock_snapshot =
                (bool) value;
-       BT_LIB_LOGV("Set stream class's \"packets have default end "
+       BT_LIB_LOGD("Set stream class's \"packets have default end "
                "clock snapshot\" property: %!+S", stream_class);
 }
 
@@ -517,7 +520,7 @@ void bt_stream_class_set_supports_discarded_events(
                (bool) supports_discarded_events;
        stream_class->discarded_events_have_default_clock_snapshots =
                (bool) with_default_clock_snapshots;
-       BT_LIB_LOGV("Set stream class's discarded events support property: "
+       BT_LIB_LOGD("Set stream class's discarded events support property: "
                "%!+S", stream_class);
 }
 
@@ -553,7 +556,7 @@ void bt_stream_class_set_supports_discarded_packets(
                (bool) supports_discarded_packets;
        stream_class->discarded_packets_have_default_clock_snapshots =
                (bool) with_default_clock_snapshots;
-       BT_LIB_LOGV("Set stream class's discarded packets support property: "
+       BT_LIB_LOGD("Set stream class's discarded packets support property: "
                "%!+S", stream_class);
 }
 
@@ -578,7 +581,7 @@ void bt_stream_class_set_assigns_automatic_stream_id(
        BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
        BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
        stream_class->assigns_automatic_stream_id = (bool) value;
-       BT_LIB_LOGV("Set stream class's automatic stream ID "
+       BT_LIB_LOGD("Set stream class's automatic stream ID "
                "assignment property: %!+S", stream_class);
 }