lib: strictly type function return status enumerations

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

diff --git a/src/lib/trace-ir/trace.c b/src/lib/trace-ir/trace.c
index 6dadb10d4aed37b053a4b3b00b7a92b78ce2b29e..fdaa7bad1a6627f241e2fe02634242ea10997787 100644 (file)
--- a/src/lib/trace-ir/trace.c
+++ b/src/lib/trace-ir/trace.c
@@ -21,8 +21,8 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "TRACE"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/TRACE"
+#include "lib/logging.h"
 
 #include "lib/assert-pre.h"
 #include <babeltrace2/trace-ir/trace.h>
@@ -55,6 +55,7 @@
 #include "trace-class.h"
 #include "trace.h"
 #include "utils.h"
+#include "lib/func-status.h"
 
 struct bt_trace_destruction_listener_elem {
        bt_trace_destruction_listener_func func;
@@ -77,7 +78,7 @@ void destroy_trace(struct bt_object *obj)
         */
        if (trace->destruction_listeners) {
                uint64_t i;
-               BT_LIB_LOGV("Calling trace destruction listener(s): %!+t", trace);
+               BT_LIB_LOGD("Calling trace destruction listener(s): %!+t", trace);
 
                /*
                * The trace's reference count is 0 if we're here. Increment
@@ -191,15 +192,16 @@ const char *bt_trace_get_name(const struct bt_trace *trace)
        return trace->name.value;
 }
 
-enum bt_trace_status bt_trace_set_name(struct bt_trace *trace, const char *name)
+enum bt_trace_set_name_status bt_trace_set_name(struct bt_trace *trace,
+               const char *name)
 {
        BT_ASSERT_PRE_NON_NULL(trace, "Trace");
        BT_ASSERT_PRE_NON_NULL(name, "Name");
        BT_ASSERT_PRE_TRACE_HOT(trace);
        g_string_assign(trace->name.str, name);
        trace->name.value = trace->name.str->str;
-       BT_LIB_LOGV("Set trace's name: %!+t", trace);
-       return BT_TRACE_STATUS_OK;
+       BT_LIB_LOGD("Set trace's name: %!+t", trace);
+       return BT_FUNC_STATUS_OK;
 }
 
 uint64_t bt_trace_get_stream_count(const struct bt_trace *trace)
@@ -250,7 +252,7 @@ const struct bt_stream *bt_trace_borrow_stream_by_id_const(
        return bt_trace_borrow_stream_by_id((void *) trace, id);
 }
 
-enum bt_trace_status bt_trace_add_destruction_listener(
+enum bt_trace_add_listener_status bt_trace_add_destruction_listener(
                const struct bt_trace *c_trace,
                bt_trace_destruction_listener_func listener,
                void *data, uint64_t *listener_id)
@@ -286,9 +288,9 @@ enum bt_trace_status bt_trace_add_destruction_listener(
                *listener_id = i;
        }
 
-       BT_LIB_LOGV("Added destruction listener: " "%![trace-]+t, "
+       BT_LIB_LOGD("Added destruction listener: " "%![trace-]+t, "
                        "listener-id=%" PRIu64, trace, i);
-       return BT_TRACE_STATUS_OK;
+       return BT_FUNC_STATUS_OK;
 }
 
 BT_ASSERT_PRE_FUNC
@@ -301,7 +303,7 @@ bool has_listener_id(const struct bt_trace *trace, uint64_t listener_id)
                        listener_id))->func != NULL;
 }
 
-enum bt_trace_status bt_trace_remove_destruction_listener(
+enum bt_trace_remove_listener_status bt_trace_remove_destruction_listener(
                const struct bt_trace *c_trace, uint64_t listener_id)
 {
        struct bt_trace *trace = (void *) c_trace;
@@ -318,10 +320,10 @@ enum bt_trace_status bt_trace_remove_destruction_listener(
 
        elem->func = NULL;
        elem->data = NULL;
-       BT_LIB_LOGV("Removed \"trace destruction listener: "
+       BT_LIB_LOGD("Removed \"trace destruction listener: "
                "%![trace-]+t, listener-id=%" PRIu64,
                trace, listener_id);
-       return BT_TRACE_STATUS_OK;
+       return BT_FUNC_STATUS_OK;
 }
 
 BT_HIDDEN