lib: strictly type function return status enumerations

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

diff --git a/src/lib/trace-ir/event-class.c b/src/lib/trace-ir/event-class.c
index e46766381226ff5955b2eb54dee10ca3bac52490..49ff7ff6c0a109cf9d3f1528e522ebf8535f1d69 100644 (file)
--- a/src/lib/trace-ir/event-class.c
+++ b/src/lib/trace-ir/event-class.c
@@ -21,8 +21,8 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "EVENT-CLASS"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/EVENT-CLASS"
+#include "lib/logging.h"
 
 #include "lib/assert-pre.h"
 #include <babeltrace2/trace-ir/field-class.h>
@@ -47,6 +47,7 @@
 #include "stream-class.h"
 #include "trace.h"
 #include "utils.h"
+#include "lib/func-status.h"
 
 #define BT_ASSERT_PRE_EVENT_CLASS_HOT(_ec) \
        BT_ASSERT_PRE_HOT(((const struct bt_event_class *) (_ec)),      \
@@ -193,7 +194,7 @@ const char *bt_event_class_get_name(const struct bt_event_class *event_class)
        return event_class->name.value;
 }
 
-enum bt_event_class_status bt_event_class_set_name(
+enum bt_event_class_set_name_status bt_event_class_set_name(
                struct bt_event_class *event_class, const char *name)
 {
        BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
@@ -201,8 +202,8 @@ enum bt_event_class_status bt_event_class_set_name(
        BT_ASSERT_PRE_EVENT_CLASS_HOT(event_class);
        g_string_assign(event_class->name.str, name);
        event_class->name.value = event_class->name.str->str;
-       BT_LIB_LOGV("Set event class's name: %!+E", event_class);
-       return BT_EVENT_CLASS_STATUS_OK;
+       BT_LIB_LOGD("Set event class's name: %!+E", event_class);
+       return BT_FUNC_STATUS_OK;
 }
 
 uint64_t bt_event_class_get_id(const struct bt_event_class *event_class)
@@ -230,7 +231,7 @@ void bt_event_class_set_log_level(
        BT_ASSERT_PRE_EVENT_CLASS_HOT(event_class);
        bt_property_uint_set(&event_class->log_level,
                (uint64_t) log_level);
-       BT_LIB_LOGV("Set event class's log level: %!+E", event_class);
+       BT_LIB_LOGD("Set event class's log level: %!+E", event_class);
 }
 
 const char *bt_event_class_get_emf_uri(const struct bt_event_class *event_class)
@@ -239,7 +240,7 @@ const char *bt_event_class_get_emf_uri(const struct bt_event_class *event_class)
        return event_class->emf_uri.value;
 }
 
-enum bt_event_class_status bt_event_class_set_emf_uri(
+enum bt_event_class_set_emf_uri_status bt_event_class_set_emf_uri(
                struct bt_event_class *event_class,
                const char *emf_uri)
 {
@@ -248,8 +249,8 @@ enum bt_event_class_status bt_event_class_set_emf_uri(
        BT_ASSERT_PRE_EVENT_CLASS_HOT(event_class);
        g_string_assign(event_class->emf_uri.str, emf_uri);
        event_class->emf_uri.value = event_class->emf_uri.str->str;
-       BT_LIB_LOGV("Set event class's EMF URI: %!+E", event_class);
-       return BT_EVENT_CLASS_STATUS_OK;
+       BT_LIB_LOGD("Set event class's EMF URI: %!+E", event_class);
+       return BT_FUNC_STATUS_OK;
 }
 
 struct bt_stream_class *bt_event_class_borrow_stream_class(
@@ -282,7 +283,8 @@ bt_event_class_borrow_specific_context_field_class(
        return event_class->specific_context_fc;
 }
 
-enum bt_event_class_status bt_event_class_set_specific_context_field_class(
+enum bt_event_class_set_field_class_status
+bt_event_class_set_specific_context_field_class(
                struct bt_event_class *event_class,
                struct bt_field_class *field_class)
 {
@@ -315,7 +317,7 @@ enum bt_event_class_status bt_event_class_set_specific_context_field_class(
                 * bt_resolve_field_paths() can fail: anything else
                 * would be because a precondition is not satisfied.
                 */
-               ret = BT_EVENT_CLASS_STATUS_NOMEM;
+               ret = BT_FUNC_STATUS_MEMORY_ERROR;
                goto end;
        }
 
@@ -324,7 +326,7 @@ enum bt_event_class_status bt_event_class_set_specific_context_field_class(
        event_class->specific_context_fc = field_class;
        bt_object_get_no_null_check(event_class->specific_context_fc);
        bt_field_class_freeze(field_class);
-       BT_LIB_LOGV("Set event class's specific context field class: %!+E",
+       BT_LIB_LOGD("Set event class's specific context field class: %!+E",
                event_class);
 
 end:
@@ -345,7 +347,8 @@ struct bt_field_class *bt_event_class_borrow_payload_field_class(
        return event_class->payload_fc;
 }
 
-enum bt_event_class_status bt_event_class_set_payload_field_class(
+enum bt_event_class_set_field_class_status
+bt_event_class_set_payload_field_class(
                struct bt_event_class *event_class,
                struct bt_field_class *field_class)
 {
@@ -379,7 +382,7 @@ enum bt_event_class_status bt_event_class_set_payload_field_class(
                 * bt_resolve_field_paths() can fail: anything else
                 * would be because a precondition is not satisfied.
                 */
-               ret = BT_EVENT_CLASS_STATUS_NOMEM;
+               ret = BT_FUNC_STATUS_MEMORY_ERROR;
                goto end;
        }
 
@@ -388,7 +391,7 @@ enum bt_event_class_status bt_event_class_set_payload_field_class(
        event_class->payload_fc = field_class;
        bt_object_get_no_null_check(event_class->payload_fc);
        bt_field_class_freeze(field_class);
-       BT_LIB_LOGV("Set event class's payload field class: %!+E", event_class);
+       BT_LIB_LOGD("Set event class's payload field class: %!+E", event_class);
 
 end:
        return ret;