X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftrace-ir%2Ffield-path-const.h;h=06dfe052b1067100fda31b52c3006466badc189f;hb=901f0ce8eca409028109888889ddeafb08d7dd69;hp=188ca31611e8762c8b0229ea0a76ba5db8063936;hpb=71c5da58f2e63c0ea0df3b603d615f5aa3dde008;p=babeltrace.git

diff --git a/include/babeltrace2/trace-ir/field-path-const.h b/include/babeltrace2/trace-ir/field-path-const.h
index 188ca316..06dfe052 100644
--- a/include/babeltrace2/trace-ir/field-path-const.h
+++ b/include/babeltrace2/trace-ir/field-path-const.h
@@ -1,8 +1,8 @@
-#ifndef BABELTRACE_TRACE_IR_FIELD_PATH_CONST_H
-#define BABELTRACE_TRACE_IR_FIELD_PATH_CONST_H
+#ifndef BABELTRACE2_TRACE_IR_FIELD_PATH_CONST_H
+#define BABELTRACE2_TRACE_IR_FIELD_PATH_CONST_H
 
 /*
- * Copyright 2016-2018 Philippe Proulx <pproulx@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
@@ -21,14 +21,14 @@
  * 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_path, bt_field_path_item */
 #include <babeltrace2/types.h>
 
 #ifdef __cplusplus
@@ -36,18 +36,19 @@ extern "C" {
 #endif
 
 typedef enum bt_field_path_item_type {
-	BT_FIELD_PATH_ITEM_TYPE_INDEX,
-	BT_FIELD_PATH_ITEM_TYPE_CURRENT_ARRAY_ELEMENT,
+	BT_FIELD_PATH_ITEM_TYPE_INDEX				= 1 << 0,
+	BT_FIELD_PATH_ITEM_TYPE_CURRENT_ARRAY_ELEMENT		= 1 << 1,
+	BT_FIELD_PATH_ITEM_TYPE_CURRENT_OPTION_CONTENT		= 1 << 2,
 } bt_field_path_item_type;
 
-typedef enum bt_scope {
-	BT_SCOPE_PACKET_CONTEXT,
-	BT_SCOPE_EVENT_COMMON_CONTEXT,
-	BT_SCOPE_EVENT_SPECIFIC_CONTEXT,
-	BT_SCOPE_EVENT_PAYLOAD,
-} bt_scope;
+typedef enum bt_field_path_scope {
+	BT_FIELD_PATH_SCOPE_PACKET_CONTEXT		= 0,
+	BT_FIELD_PATH_SCOPE_EVENT_COMMON_CONTEXT	= 1,
+	BT_FIELD_PATH_SCOPE_EVENT_SPECIFIC_CONTEXT	= 2,
+	BT_FIELD_PATH_SCOPE_EVENT_PAYLOAD		= 3,
+} bt_field_path_scope;
 
-extern bt_scope bt_field_path_get_root_scope(
+extern bt_field_path_scope bt_field_path_get_root_scope(
 		const bt_field_path *field_path);
 
 extern uint64_t bt_field_path_get_item_count(
@@ -83,4 +84,4 @@ extern void bt_field_path_put_ref(const bt_field_path *field_path);
 }
 #endif
 
-#endif /* BABELTRACE_TRACE_IR_FIELD_PATH_CONST_H */
+#endif /* BABELTRACE2_TRACE_IR_FIELD_PATH_CONST_H */