X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftrace-ir%2Fstream-class.h;h=15457cfcaedd6beb3f2f633a6db430c7f16f788f;hb=924dc299c8a893e92fcd985fa05c245b591ef314;hp=f6a950f87033c1d3dcc2b32654020ba3b84ed366;hpb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;p=babeltrace.git

diff --git a/include/babeltrace2/trace-ir/stream-class.h b/include/babeltrace2/trace-ir/stream-class.h
index f6a950f8..15457cfc 100644
--- a/include/babeltrace2/trace-ir/stream-class.h
+++ b/include/babeltrace2/trace-ir/stream-class.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_TRACE_IR_STREAM_CLASS_H
-#define BABELTRACE_TRACE_IR_STREAM_CLASS_H
+#ifndef BABELTRACE2_TRACE_IR_STREAM_CLASS_H
+#define BABELTRACE2_TRACE_IR_STREAM_CLASS_H
 
 /*
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
@@ -35,8 +35,10 @@
  */
 #include <babeltrace2/types.h>
 
-/* For bt_stream_class_status */
-#include <babeltrace2/trace-ir/stream-class-const.h>
+/* For __BT_FUNC_STATUS_* */
+#define __BT_FUNC_STATUS_ENABLE
+#include <babeltrace2/func-status.h>
+#undef __BT_FUNC_STATUS_ENABLE
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,7 +53,12 @@ extern bt_stream_class *bt_stream_class_create_with_id(
 extern bt_trace_class *bt_stream_class_borrow_trace_class(
 		bt_stream_class *stream_class);
 
-extern bt_stream_class_status bt_stream_class_set_name(
+typedef enum bt_stream_class_set_name_status {
+	BT_STREAM_CLASS_SET_NAME_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_STREAM_CLASS_SET_NAME_STATUS_OK		= __BT_FUNC_STATUS_OK,
+} bt_stream_class_set_name_status;
+
+extern bt_stream_class_set_name_status bt_stream_class_set_name(
 		bt_stream_class *stream_class, const char *name);
 
 extern void bt_stream_class_set_assigns_automatic_event_class_id(
@@ -60,12 +67,6 @@ extern void bt_stream_class_set_assigns_automatic_event_class_id(
 extern void bt_stream_class_set_assigns_automatic_stream_id(
 		bt_stream_class *stream_class, bt_bool value);
 
-extern void bt_stream_class_set_packets_have_beginning_default_clock_snapshot(
-		bt_stream_class *stream_class, bt_bool value);
-
-extern void bt_stream_class_set_packets_have_end_default_clock_snapshot(
-		bt_stream_class *stream_class, bt_bool value);
-
 extern void bt_stream_class_set_supports_discarded_events(
 		bt_stream_class *stream_class,
 		bt_bool supports_discarded_events,
@@ -76,7 +77,17 @@ extern void bt_stream_class_set_supports_discarded_packets(
 		bt_bool supports_discarded_packets,
 		bt_bool with_default_clock_snapshots);
 
-extern bt_stream_class_status
+typedef enum bt_stream_class_set_field_class_status {
+	BT_STREAM_CLASS_SET_FIELD_CLASS_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_STREAM_CLASS_SET_FIELD_CLASS_STATUS_OK		= __BT_FUNC_STATUS_OK,
+} bt_stream_class_set_field_class_status;
+
+extern void bt_stream_class_set_supports_packets(
+		bt_stream_class *stream_class, bt_bool supports_packets,
+		bt_bool with_beginning_default_clock_snapshot,
+		bt_bool with_end_default_clock_snapshot);
+
+extern bt_stream_class_set_field_class_status
 bt_stream_class_set_packet_context_field_class(
 		bt_stream_class *stream_class,
 		bt_field_class *field_class);
@@ -85,7 +96,7 @@ extern bt_field_class *
 bt_stream_class_borrow_packet_context_field_class(
 		bt_stream_class *stream_class);
 
-extern bt_stream_class_status
+extern bt_stream_class_set_field_class_status
 bt_stream_class_set_event_common_context_field_class(
 		bt_stream_class *stream_class,
 		bt_field_class *field_class);
@@ -105,7 +116,12 @@ bt_stream_class_borrow_event_class_by_id(
 extern bt_clock_class *bt_stream_class_borrow_default_clock_class(
 		bt_stream_class *stream_class);
 
-extern bt_stream_class_status bt_stream_class_set_default_clock_class(
+typedef enum bt_stream_class_set_default_clock_class_status {
+	BT_STREAM_CLASS_SET_DEFAULT_CLOCK_CLASS_STATUS_OK	= __BT_FUNC_STATUS_OK,
+} bt_stream_class_set_default_clock_class_status;
+
+extern bt_stream_class_set_default_clock_class_status
+bt_stream_class_set_default_clock_class(
 		bt_stream_class *stream_class,
 		bt_clock_class *clock_class);
 
@@ -113,4 +129,6 @@ extern bt_stream_class_status bt_stream_class_set_default_clock_class(
 }
 #endif
 
-#endif /* BABELTRACE_TRACE_IR_STREAM_CLASS_H */
+#include <babeltrace2/undef-func-status.h>
+
+#endif /* BABELTRACE2_TRACE_IR_STREAM_CLASS_H */