lib: add internal object pool API and use it; adapt plugins/tests

[babeltrace.git] / lib / ctf-ir / utils.c

diff --git a/lib/ctf-ir/utils.c b/lib/ctf-ir/utils.c
index 0b08652991afdb7e29891aaf2622c8381676f9d5..312deb9dea835308d06fb967d7351c306357d7c1 100644 (file)
--- a/lib/ctf-ir/utils.c
+++ b/lib/ctf-ir/utils.c
@@ -29,10 +29,13 @@
 #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>
+#include <babeltrace/ctf-ir/field-types-internal.h>
+#include <babeltrace/ctf-ir/clock-class.h>
+#include <babeltrace/ref.h>
+#include <babeltrace/assert-internal.h>
 
 static
 const char * const reserved_keywords_str[] = {"align", "callsite",
@@ -56,7 +59,7 @@ void try_init_reserved_keywords(void)
        }
 
        reserved_keywords_set = g_hash_table_new(g_direct_hash, g_direct_equal);
-       assert(reserved_keywords_set);
+       BT_ASSERT(reserved_keywords_set);
 
        for (i = 0; i < reserved_keywords_count; i++) {
                gpointer quark = GINT_TO_POINTER(g_quark_from_string(
@@ -76,29 +79,29 @@ void trace_finalize(void)
        }
 }
 
-int bt_ctf_validate_identifier(const char *input_string)
+bt_bool bt_identifier_is_valid(const char *identifier)
 {
-       int ret = 0;
+       bt_bool is_valid = BT_TRUE;
        char *string = NULL;
        char *save_ptr, *token;
 
-       if (!input_string) {
+       if (!identifier) {
                BT_LOGV_STR("Invalid parameter: input string is NULL.");
-               ret = -1;
+               is_valid = BT_FALSE;
                goto end;
        }
 
        try_init_reserved_keywords();
 
-       if (input_string[0] == '\0') {
-               ret = -1;
+       if (identifier[0] == '\0') {
+               is_valid = BT_FALSE;
                goto end;
        }
 
-       string = strdup(input_string);
+       string = strdup(identifier);
        if (!string) {
                BT_LOGE("strdup() failed.");
-               ret = -1;
+               is_valid = BT_FALSE;
                goto end;
        }
 
@@ -107,7 +110,7 @@ int bt_ctf_validate_identifier(const char *input_string)
                if (g_hash_table_lookup_extended(reserved_keywords_set,
                        GINT_TO_POINTER(g_quark_from_string(token)),
                        NULL, NULL)) {
-                       ret = -1;
+                       is_valid = BT_FALSE;
                        goto end;
                }
 
@@ -115,10 +118,5 @@ int bt_ctf_validate_identifier(const char *input_string)
        }
 end:
        free(string);
-       return ret;
-}
-
-bt_bool bt_ctf_identifier_is_valid(const char *identifier)
-{
-       return bt_ctf_validate_identifier(identifier);
+       return is_valid;
 }