lib: standardize public include guards

[babeltrace.git] / include / babeltrace2 / trace-ir / field-class-const.h

diff --git a/include/babeltrace2/trace-ir/field-class-const.h b/include/babeltrace2/trace-ir/field-class-const.h
index b07ee4b615880ad27957649df672f94a53106baa..1dd49f0adac505b56a83735cbb52ca4a9972c299 100644 (file)
--- a/include/babeltrace2/trace-ir/field-class-const.h
+++ b/include/babeltrace2/trace-ir/field-class-const.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_TRACE_IR_FIELD_CLASSES_CONST_H
-#define BABELTRACE_TRACE_IR_FIELD_CLASSES_CONST_H
+#ifndef BABELTRACE2_TRACE_IR_FIELD_CLASS_CONST_H
+#define BABELTRACE2_TRACE_IR_FIELD_CLASS_CONST_H
 
 /*
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
@@ -39,15 +39,15 @@
 #include <stdint.h>
 #include <stddef.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
 
-typedef enum bt_field_class_status {
-       BT_FIELD_CLASS_STATUS_OK = 0,
-       BT_FIELD_CLASS_STATUS_NOMEM = -12,
-} bt_field_class_status;
-
 typedef enum bt_field_class_type {
        BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER,
        BT_FIELD_CLASS_TYPE_SIGNED_INTEGER,
@@ -124,14 +124,19 @@ bt_field_class_signed_enumeration_mapping_get_range_by_index(
                const bt_field_class_signed_enumeration_mapping *mapping,
                uint64_t index, int64_t *lower, int64_t *upper);
 
-extern bt_field_class_status
-bt_field_class_unsigned_enumeration_get_mapping_labels_by_value(
+typedef enum bt_field_class_enumeration_get_mapping_labels_for_value_status {
+       BT_FIELD_CLASS_ENUMERATION_GET_MAPPING_LABELS_BY_VALUE_STATUS_MEMORY_ERROR      = __BT_FUNC_STATUS_MEMORY_ERROR,
+       BT_FIELD_CLASS_ENUMERATION_GET_MAPPING_LABELS_BY_VALUE_STATUS_OK                = __BT_FUNC_STATUS_OK,
+} bt_field_class_enumeration_get_mapping_labels_for_value_status;
+
+extern bt_field_class_enumeration_get_mapping_labels_for_value_status
+bt_field_class_unsigned_enumeration_get_mapping_labels_for_value(
                const bt_field_class *field_class, uint64_t value,
                bt_field_class_enumeration_mapping_label_array *label_array,
                uint64_t *count);
 
-extern bt_field_class_status
-bt_field_class_signed_enumeration_get_mapping_labels_by_value(
+extern bt_field_class_enumeration_get_mapping_labels_for_value_status
+bt_field_class_signed_enumeration_get_mapping_labels_for_value(
                const bt_field_class *field_class, int64_t value,
                bt_field_class_enumeration_mapping_label_array *label_array,
                uint64_t *count);
@@ -209,4 +214,6 @@ extern void bt_field_class_put_ref(const bt_field_class *field_class);
 }
 #endif
 
-#endif /* BABELTRACE_TRACE_IR_FIELD_CLASSES_CONST_H */
+#include <babeltrace2/undef-func-status.h>
+
+#endif /* BABELTRACE2_TRACE_IR_FIELD_CLASS_CONST_H */