X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fctf-writer%2Futils.h;h=c344bcbedc62bbee90c4aab392e3c4e8e10ab090;hp=f08d544bd7ab6bb2a711f1beecc88aa101bd14fb;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=217cf9d33a3ffc88e6eeaf21f3d46ee00cbeb0c4

diff --git a/src/ctf-writer/utils.h b/src/ctf-writer/utils.h
index f08d544b..c344bcbe 100644
--- a/src/ctf-writer/utils.h
+++ b/src/ctf-writer/utils.h
@@ -1,26 +1,12 @@
-#ifndef BABELTRACE_CTF_WRITER_UTILS_INTERNAL_H
-#define BABELTRACE_CTF_WRITER_UTILS_INTERNAL_H
-
 /*
- * 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 2019 EfficiOS, Inc
  */
 
+#ifndef BABELTRACE_CTF_WRITER_UTILS_INTERNAL_H
+#define BABELTRACE_CTF_WRITER_UTILS_INTERNAL_H
+
 #include "common/macros.h"
 #include <babeltrace2-ctf-writer/field-types.h>
 #include <babeltrace2-ctf-writer/event.h>
@@ -36,9 +22,6 @@ struct bt_ctf_search_query {
 	int found;
 };
 
-BT_HIDDEN
-const char *bt_ctf_get_byte_order_string(enum bt_ctf_byte_order byte_order);
-
 static inline
 const char *bt_ctf_field_type_id_string(enum bt_ctf_field_type_id type_id)
 {
@@ -200,13 +183,13 @@ GString *bt_ctf_field_path_string(struct bt_ctf_field_path *path)
 	GString *str = g_string_new(NULL);
 	size_t i;
 
-	BT_ASSERT(path);
+	BT_ASSERT_DBG(path);
 
 	if (!str) {
 		goto end;
 	}
 
-	g_string_append_printf(str, "[%s", bt_common_scope_string(
+	g_string_append_printf(str, "[%s", bt_ctf_scope_string(
 		bt_ctf_field_path_get_root_scope(path)));
 
 	for (i = 0; i < bt_ctf_field_path_get_index_count(path); i++) {