X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftrace-ir%2Ffield-class.h;h=f66fbb44525383a0f1bc775f27834cce0fa3f8ce;hb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;hp=8da8acde7a2435e0c9267a1de514624190bf6734;hpb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;p=babeltrace.git

diff --git a/include/babeltrace2/trace-ir/field-class.h b/include/babeltrace2/trace-ir/field-class.h
index 8da8acde..f66fbb44 100644
--- a/include/babeltrace2/trace-ir/field-class.h
+++ b/include/babeltrace2/trace-ir/field-class.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_TRACE_IR_FIELD_CLASSES_H
-#define BABELTRACE_TRACE_IR_FIELD_CLASSES_H
+#ifndef BABELTRACE2_TRACE_IR_FIELD_CLASS_H
+#define BABELTRACE2_TRACE_IR_FIELD_CLASS_H
 
 /*
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
@@ -27,18 +27,19 @@
  * http://www.efficios.com/ctf
  */
 
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
+#endif
+
+#include <stdint.h>
+#include <stddef.h>
+
 /* For bt_bool, bt_field_class, bt_trace_class */
 #include <babeltrace2/types.h>
 
-/*
- * For bt_field_class_status,
- * bt_field_class_integer_preferred_display_base
- */
+/* For bt_field_class_integer_preferred_display_base */
 #include <babeltrace2/trace-ir/field-class-const.h>
 
-#include <stdint.h>
-#include <stddef.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -68,11 +69,18 @@ extern bt_field_class *bt_field_class_unsigned_enumeration_create(
 extern bt_field_class *bt_field_class_signed_enumeration_create(
 		bt_trace_class *trace_class);
 
-extern bt_field_class_status bt_field_class_unsigned_enumeration_map_range(
+typedef enum bt_field_class_enumeration_map_range_status {
+	BT_FIELD_CLASS_ENUMERATION_MAP_RANGE_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_FIELD_CLASS_ENUMERATION_MAP_RANGE_STATUS_OK			= __BT_FUNC_STATUS_OK,
+} bt_field_class_enumeration_map_range_status;
+
+extern bt_field_class_enumeration_map_range_status
+bt_field_class_unsigned_enumeration_map_range(
 		bt_field_class *field_class, const char *label,
 		uint64_t range_lower, uint64_t range_upper);
 
-extern bt_field_class_status bt_field_class_signed_enumeration_map_range(
+extern bt_field_class_enumeration_map_range_status
+bt_field_class_signed_enumeration_map_range(
 		bt_field_class *field_class, const char *label,
 		int64_t range_lower, int64_t range_upper);
 
@@ -82,7 +90,13 @@ extern bt_field_class *bt_field_class_string_create(
 extern bt_field_class *bt_field_class_structure_create(
 		bt_trace_class *trace_class);
 
-extern bt_field_class_status bt_field_class_structure_append_member(
+typedef enum bt_field_class_structure_append_member_status {
+	BT_FIELD_CLASS_STRUCTURE_APPEND_MEMBER_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_FIELD_CLASS_STRUCTURE_APPEND_MEMBER_STATUS_OK		= __BT_FUNC_STATUS_OK,
+} bt_field_class_structure_append_member_status;
+
+extern bt_field_class_structure_append_member_status
+bt_field_class_structure_append_member(
 		bt_field_class *struct_field_class,
 		const char *name, bt_field_class *field_class);
 
@@ -105,7 +119,12 @@ extern bt_field_class *bt_field_class_dynamic_array_create(
 extern bt_field_class *bt_field_class_array_borrow_element_field_class(
 		bt_field_class *field_class);
 
-extern bt_field_class_status
+typedef enum bt_field_class_dynamic_array_set_length_field_class_status {
+	BT_FIELD_CLASS_DYNAMIC_ARRAY_SET_LENGTH_FIELD_CLASS_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_FIELD_CLASS_DYNAMIC_ARRAY_SET_LENGTH_FIELD_CLASS_STATUS_OK			= __BT_FUNC_STATUS_OK,
+} bt_field_class_dynamic_array_set_length_field_class_status;
+
+extern bt_field_class_dynamic_array_set_length_field_class_status
 bt_field_class_dynamic_array_set_length_field_class(
 		bt_field_class *field_class,
 		bt_field_class *length_field_class);
@@ -113,11 +132,22 @@ bt_field_class_dynamic_array_set_length_field_class(
 extern bt_field_class *bt_field_class_variant_create(
 		bt_trace_class *trace_class);
 
-extern bt_field_class_status
+typedef enum bt_field_class_variant_set_selector_field_class_status {
+	BT_FIELD_CLASS_VARIANT_SET_SELECTOR_FIELD_CLASS_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_FIELD_CLASS_VARIANT_SET_SELECTOR_FIELD_CLASS_STATUS_OK			= __BT_FUNC_STATUS_OK,
+} bt_field_class_variant_set_selector_field_class_status;
+
+extern bt_field_class_variant_set_selector_field_class_status
 bt_field_class_variant_set_selector_field_class(bt_field_class *field_class,
 		bt_field_class *selector_field_class);
 
-extern bt_field_class_status bt_field_class_variant_append_option(
+typedef enum bt_field_class_variant_append_option_status {
+	BT_FIELD_CLASS_VARIANT_APPEND_OPTION_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_FIELD_CLASS_VARIANT_APPEND_OPTION_STATUS_OK			= __BT_FUNC_STATUS_OK,
+} bt_field_class_variant_append_option_status;
+
+extern bt_field_class_variant_append_option_status
+bt_field_class_variant_append_option(
 		bt_field_class *var_field_class,
 		const char *name, bt_field_class *field_class);
 
@@ -136,4 +166,4 @@ extern bt_field_class *bt_field_class_variant_option_borrow_field_class(
 }
 #endif
 
-#endif /* BABELTRACE_TRACE_IR_FIELD_CLASSES_H */
+#endif /* BABELTRACE2_TRACE_IR_FIELD_CLASS_H */