X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftrace-ir%2Ffield.h;h=311c53a8bfbf5af25f9d5e2776b0fac00130e75b;hb=5cebbe7fc898bb1d887cbdac1f4dd5f0042443fd;hp=1b80cdfb2d1f00dc3c50209af25385866cb1eccd;hpb=924dc299c8a893e92fcd985fa05c245b591ef314;p=babeltrace.git

diff --git a/include/babeltrace2/trace-ir/field.h b/include/babeltrace2/trace-ir/field.h
index 1b80cdfb..311c53a8 100644
--- a/include/babeltrace2/trace-ir/field.h
+++ b/include/babeltrace2/trace-ir/field.h
@@ -2,8 +2,7 @@
 #define BABELTRACE2_TRACE_IR_FIELD_H
 
 /*
- * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
- * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (c) 2010-2019 EfficiOS Inc. and Linux Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,29 +21,26 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * The Common Trace Format (CTF) Specification is available at
- * 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_FUNC_STATUS_* */
-#define __BT_FUNC_STATUS_ENABLE
-#include <babeltrace2/func-status.h>
-#undef __BT_FUNC_STATUS_ENABLE
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern void bt_field_signed_integer_set_value(bt_field *field,
+extern void bt_field_bool_set_value(bt_field *field, bt_bool value);
+
+extern void bt_field_integer_signed_set_value(bt_field *field,
 		int64_t value);
 
-extern void bt_field_unsigned_integer_set_value(bt_field *field,
+extern void bt_field_integer_unsigned_set_value(bt_field *field,
 		uint64_t value);
 
 extern void bt_field_real_set_value(bt_field *field, double value);
@@ -79,21 +75,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);
 
-typedef enum bt_field_dynamic_array_set_length_status {
+typedef enum bt_field_array_dynamic_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;
+} bt_field_array_dynamic_set_length_status;
 
-extern bt_field_dynamic_array_set_length_status
-bt_field_dynamic_array_set_length(
+extern bt_field_array_dynamic_set_length_status
+bt_field_array_dynamic_set_length(
 		bt_field *field, uint64_t length);
 
-typedef enum bt_field_variant_select_option_field_status {
+typedef enum bt_field_variant_select_option_field_by_index_status {
 	BT_FIELD_VARIANT_SELECT_OPTION_FIELD_STATUS_OK		= __BT_FUNC_STATUS_OK,
-} bt_field_variant_select_option_field_status;
+} bt_field_variant_select_option_field_by_index_status;
 
-extern bt_field_variant_select_option_field_status
-bt_field_variant_select_option_field(
+extern bt_field_variant_select_option_field_by_index_status
+bt_field_variant_select_option_field_by_index(
 		bt_field *field, uint64_t index);
 
 extern bt_field *bt_field_variant_borrow_selected_option_field(
@@ -103,6 +99,4 @@ extern bt_field *bt_field_variant_borrow_selected_option_field(
 }
 #endif
 
-#include <babeltrace2/undef-func-status.h>
-
 #endif /* BABELTRACE2_TRACE_IR_FIELD_H */