X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Futils.c;h=5f03c92c85bf42ad10815010269aabdfe736674b;hb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;hp=5ac824754772576fa97c174d64cde09fb59baba8;hpb=ef267d12284b855bc52ee429a5dc12da1d1e3b95;p=babeltrace.git

diff --git a/src/ctf-writer/utils.c b/src/ctf-writer/utils.c
index 5ac82475..5f03c92c 100644
--- a/src/ctf-writer/utils.c
+++ b/src/ctf-writer/utils.c
@@ -32,8 +32,8 @@
 #include <glib.h>
 #include <stdlib.h>
 
-#include <babeltrace2/ctf-writer/utils.h>
-#include <babeltrace2/ctf-writer/object.h>
+#include <babeltrace2-ctf-writer/utils.h>
+#include <babeltrace2-ctf-writer/object.h>
 
 #include "common/assert.h"
 
@@ -62,7 +62,7 @@ void try_init_reserved_keywords(void)
 	}
 
 	reserved_keywords_set = g_hash_table_new(g_direct_hash, g_direct_equal);
-	BT_ASSERT(reserved_keywords_set);
+	BT_ASSERT_DBG(reserved_keywords_set);
 
 	for (i = 0; i < reserved_keywords_count; i++) {
 		gpointer quark = GINT_TO_POINTER(g_quark_from_string(
@@ -82,29 +82,29 @@ void trace_finalize(void)
 	}
 }
 
-bt_bool bt_ctf_identifier_is_valid(const char *identifier)
+bt_ctf_bool bt_ctf_identifier_is_valid(const char *identifier)
 {
-	bt_bool is_valid = BT_TRUE;
+	bt_ctf_bool is_valid = BT_CTF_TRUE;
 	char *string = NULL;
 	char *save_ptr, *token;
 
 	if (!identifier) {
 		BT_LOGT_STR("Invalid parameter: input string is NULL.");
-		is_valid = BT_FALSE;
+		is_valid = BT_CTF_FALSE;
 		goto end;
 	}
 
 	try_init_reserved_keywords();
 
 	if (identifier[0] == '\0') {
-		is_valid = BT_FALSE;
+		is_valid = BT_CTF_FALSE;
 		goto end;
 	}
 
 	string = strdup(identifier);
 	if (!string) {
 		BT_LOGE("strdup() failed.");
-		is_valid = BT_FALSE;
+		is_valid = BT_CTF_FALSE;
 		goto end;
 	}
 
@@ -113,7 +113,7 @@ bt_bool bt_ctf_identifier_is_valid(const char *identifier)
 		if (g_hash_table_lookup_extended(reserved_keywords_set,
 			GINT_TO_POINTER(g_quark_from_string(token)),
 			NULL, NULL)) {
-			is_valid = BT_FALSE;
+			is_valid = BT_CTF_FALSE;
 			goto end;
 		}