X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fctf-ir%2Futils.c;h=41337cfddb1914d94cc1bc67c83f5c9e6d3751bd;hb=7b33a0e0d8f23d90285ea7c7820a725bcbd96c6b;hp=12daedbd9105d787c35d5b8ea262c175ebfbdc55;hpb=839d52a5c5c1fdd66cee9bf7d06c0c0acdd4c2a3;p=babeltrace.git

diff --git a/lib/ctf-ir/utils.c b/lib/ctf-ir/utils.c
index 12daedbd..41337cfd 100644
--- a/lib/ctf-ir/utils.c
+++ b/lib/ctf-ir/utils.c
@@ -29,96 +29,9 @@
 #define BT_LOG_TAG "CTF-IR-UTILS"
 #include <babeltrace/lib-logging-internal.h>
 
-#include <assert.h>
 #include <stdlib.h>
 #include <glib.h>
-#include <babeltrace/ctf-ir/utils.h>
-
-static
-const char * const reserved_keywords_str[] = {"align", "callsite",
-	"const", "char", "clock", "double", "enum", "env", "event",
-	"floating_point", "float", "integer", "int", "long", "short", "signed",
-	"stream", "string", "struct", "trace", "typealias", "typedef",
-	"unsigned", "variant", "void" "_Bool", "_Complex", "_Imaginary"};
-
-static GHashTable *reserved_keywords_set;
-static int init_done;
-
-static
-void try_init_reserved_keywords(void)
-{
-	size_t i;
-	const size_t reserved_keywords_count =
-		sizeof(reserved_keywords_str) / sizeof(char *);
-
-	if (reserved_keywords_set) {
-		return;
-	}
-
-	reserved_keywords_set = g_hash_table_new(g_direct_hash, g_direct_equal);
-	assert(reserved_keywords_set);
-
-	for (i = 0; i < reserved_keywords_count; i++) {
-		gpointer quark = GINT_TO_POINTER(g_quark_from_string(
-			reserved_keywords_str[i]));
-
-		g_hash_table_insert(reserved_keywords_set, quark, quark);
-	}
-
-	init_done = 1;
-}
-
-static __attribute__((destructor))
-void trace_finalize(void)
-{
-	if (reserved_keywords_set) {
-		g_hash_table_destroy(reserved_keywords_set);
-	}
-}
-
-int bt_validate_identifier(const char *input_string)
-{
-	int ret = 0;
-	char *string = NULL;
-	char *save_ptr, *token;
-
-	if (!input_string) {
-		BT_LOGV_STR("Invalid parameter: input string is NULL.");
-		ret = -1;
-		goto end;
-	}
-
-	try_init_reserved_keywords();
-
-	if (input_string[0] == '\0') {
-		ret = -1;
-		goto end;
-	}
-
-	string = strdup(input_string);
-	if (!string) {
-		BT_LOGE("strdup() failed.");
-		ret = -1;
-		goto end;
-	}
-
-	token = strtok_r(string, " ", &save_ptr);
-	while (token) {
-		if (g_hash_table_lookup_extended(reserved_keywords_set,
-			GINT_TO_POINTER(g_quark_from_string(token)),
-			NULL, NULL)) {
-			ret = -1;
-			goto end;
-		}
-
-		token = strtok_r(NULL, " ", &save_ptr);
-	}
-end:
-	free(string);
-	return ret;
-}
-
-bt_bool bt_identifier_is_valid(const char *identifier)
-{
-	return bt_validate_identifier(identifier);
-}
+#include <babeltrace/ctf-ir/field-types-internal.h>
+#include <babeltrace/ctf-ir/clock-class.h>
+#include <babeltrace/ref.h>
+#include <babeltrace/assert-internal.h>