X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ffield-path.h;h=cae07b8c66e36237e58ede233ce59d7ea25ab438;hp=506c0063d7fe43c8b579bfb9d8b5c440f564f9e4;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d

diff --git a/src/lib/trace-ir/field-path.h b/src/lib/trace-ir/field-path.h
index 506c0063..cae07b8c 100644
--- a/src/lib/trace-ir/field-path.h
+++ b/src/lib/trace-ir/field-path.h
@@ -1,34 +1,19 @@
-#ifndef BABELTRACE_TRACE_IR_FIELD_PATH_INTERNAL
-#define BABELTRACE_TRACE_IR_FIELD_PATH_INTERNAL
-
 /*
- * Copyright 2016-2018 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * SPDX-License-Identifier: MIT
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * 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.
+ * Copyright 2016-2018 Philippe Proulx <pproulx@efficios.com>
  *
  * The Common Trace Format (CTF) Specification is available at
  * http://www.efficios.com/ctf
  */
 
+#ifndef BABELTRACE_TRACE_IR_FIELD_PATH_INTERNAL
+#define BABELTRACE_TRACE_IR_FIELD_PATH_INTERNAL
+
 #include "lib/object.h"
-#include <babeltrace2/trace-ir/field-path-const.h>
+#include <babeltrace2/trace-ir/field-path.h>
 #include "common/assert.h"
+#include "common/macros.h"
 #include <glib.h>
 
 struct bt_field_path_item {
@@ -38,7 +23,7 @@ struct bt_field_path_item {
 
 struct bt_field_path {
 	struct bt_object base;
-	enum bt_scope root;
+	enum bt_field_path_scope root;
 
 	/* Array of `struct bt_field_path_item` (items) */
 	GArray *items;
@@ -51,8 +36,8 @@ static inline
 struct bt_field_path_item *bt_field_path_borrow_item_by_index_inline(
 		const struct bt_field_path *field_path, uint64_t index)
 {
-	BT_ASSERT(field_path);
-	BT_ASSERT(index < field_path->items->len);
+	BT_ASSERT_DBG(field_path);
+	BT_ASSERT_DBG(index < field_path->items->len);
 	return &g_array_index(field_path->items, struct bt_field_path_item,
 		index);
 }
@@ -79,9 +64,9 @@ const char *bt_field_path_item_type_string(enum bt_field_path_item_type type)
 {
 	switch (type) {
 	case BT_FIELD_PATH_ITEM_TYPE_INDEX:
-		return "BT_FIELD_PATH_ITEM_TYPE_INDEX";
+		return "INDEX";
 	case BT_FIELD_PATH_ITEM_TYPE_CURRENT_ARRAY_ELEMENT:
-		return "BT_FIELD_PATH_ITEM_TYPE_CURRENT_ARRAY_ELEMENT";
+		return "CURRENT_ARRAY_ELEMENT";
 	default:
 		return "(unknown)";
 	}