X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fstream-class.c;h=7abea88491b456bdba8a7876608c99afd23cadf2;hb=d24d56638469189904fb6ddbb3c725817b3e9417;hp=b77f46aa80adb23de6c8753ab37ccb97d3f85558;hpb=3f7d4d90b0456de9d34fac337350818ef06163bd;p=babeltrace.git

diff --git a/src/lib/trace-ir/stream-class.c b/src/lib/trace-ir/stream-class.c
index b77f46aa..7abea884 100644
--- 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)
 {
@@ -215,7 +216,7 @@ enum bt_stream_class_status bt_stream_class_set_name(
 	g_string_assign(stream_class->name.str, name);
 	stream_class->name.value = stream_class->name.str->str;
 	BT_LIB_LOGD("Set stream class's name: %!+S", stream_class);
-	return BT_STREAM_CLASS_STATUS_OK;
+	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;
 	}
 
@@ -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;
 	}
 
@@ -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)
 {
@@ -417,7 +420,7 @@ enum bt_stream_class_status bt_stream_class_set_default_clock_class(
 	bt_clock_class_freeze(clock_class);
 	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(