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

diff --git a/include/babeltrace2/trace-ir/field.h b/include/babeltrace2/trace-ir/field.h
index d336faf3..4910927f 100644
--- a/include/babeltrace2/trace-ir/field.h
+++ b/include/babeltrace2/trace-ir/field.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_TRACE_IR_FIELDS_H
-#define BABELTRACE_TRACE_IR_FIELDS_H
+#ifndef BABELTRACE2_TRACE_IR_FIELD_H
+#define BABELTRACE2_TRACE_IR_FIELD_H
 
 /*
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
@@ -27,14 +27,15 @@
  * http://www.efficios.com/ctf
  */
 
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
+#endif
+
 #include <stdint.h>
 
 /* For bt_field, bt_field_class */
 #include <babeltrace2/types.h>
 
-/* For bt_field_status */
-#include <babeltrace2/trace-ir/field-const.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -47,16 +48,26 @@ extern void bt_field_unsigned_integer_set_value(bt_field *field,
 
 extern void bt_field_real_set_value(bt_field *field, double value);
 
-extern bt_field_status bt_field_string_set_value(bt_field *field,
-		const char *value);
+typedef enum bt_field_string_set_value_status {
+	BT_FIELD_STRING_SET_VALUE_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_FIELD_STRING_SET_VALUE_STATUS_OK		= __BT_FUNC_STATUS_OK,
+} bt_field_string_set_value_status;
+
+extern bt_field_string_set_value_status bt_field_string_set_value(
+		bt_field *field, const char *value);
 
-extern bt_field_status bt_field_string_append(bt_field *field,
-		const char *value);
+typedef enum bt_field_string_append_status {
+	BT_FIELD_STRING_APPEND_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_FIELD_STRING_APPEND_STATUS_OK		= __BT_FUNC_STATUS_OK,
+} bt_field_string_append_status;
 
-extern bt_field_status bt_field_string_append_with_length(bt_field *field,
-		const char *value, uint64_t length);
+extern bt_field_string_append_status bt_field_string_append(
+		bt_field *field, const char *value);
 
-extern bt_field_status bt_field_string_clear(bt_field *field);
+extern bt_field_string_append_status bt_field_string_append_with_length(
+		bt_field *field, const char *value, uint64_t length);
+
+extern void bt_field_string_clear(bt_field *field);
 
 extern bt_field *bt_field_structure_borrow_member_field_by_index(
 		bt_field *field, uint64_t index);
@@ -67,10 +78,21 @@ extern bt_field *bt_field_structure_borrow_member_field_by_name(
 extern bt_field *bt_field_array_borrow_element_field_by_index(
 		bt_field *field, uint64_t index);
 
-extern bt_field_status bt_field_dynamic_array_set_length(bt_field *field,
-		uint64_t length);
+typedef enum bt_field_dynamic_array_set_length_status {
+	BT_FIELD_DYNAMIC_ARRAY_SET_LENGTH_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_FIELD_DYNAMIC_ARRAY_SET_LENGTH_STATUS_OK		= __BT_FUNC_STATUS_OK,
+} bt_field_dynamic_array_set_length_status;
+
+extern bt_field_dynamic_array_set_length_status
+bt_field_dynamic_array_set_length(
+		bt_field *field, uint64_t length);
+
+typedef enum bt_field_variant_select_option_field_status {
+	BT_FIELD_VARIANT_SELECT_OPTION_FIELD_STATUS_OK		= __BT_FUNC_STATUS_OK,
+} bt_field_variant_select_option_field_status;
 
-extern bt_field_status bt_field_variant_select_option_field(
+extern bt_field_variant_select_option_field_status
+bt_field_variant_select_option_field(
 		bt_field *field, uint64_t index);
 
 extern bt_field *bt_field_variant_borrow_selected_option_field(
@@ -80,4 +102,4 @@ extern bt_field *bt_field_variant_borrow_selected_option_field(
 }
 #endif
 
-#endif /* BABELTRACE_TRACE_IR_FIELDS_H */
+#endif /* BABELTRACE2_TRACE_IR_FIELD_H */