* SOFTWARE.
*/
-#include <string.h>
+#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 GHashTable *reserved_keywords_set;
static int init_done;
-static int global_data_refcount;
-static __attribute__((constructor))
-void trace_init(void)
+static
+void try_init_reserved_keywords(void)
{
size_t i;
const size_t reserved_keywords_count =
sizeof(reserved_keywords_str) / sizeof(char *);
- global_data_refcount++;
- if (init_done) {
+ 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]));
static __attribute__((destructor))
void trace_finalize(void)
{
- if (--global_data_refcount == 0) {
+ if (reserved_keywords_set) {
g_hash_table_destroy(reserved_keywords_set);
}
}
-int bt_ctf_validate_identifier(const char *input_string)
+int bt_validate_identifier(const char *input_string)
{
int ret = 0;
char *string = NULL;
char *save_ptr, *token;
- if (!input_string || input_string[0] == '\0') {
+ 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;
}
return ret;
}
-bt_bool bt_ctf_identifier_is_valid(const char *identifier)
+bt_bool bt_identifier_is_valid(const char *identifier)
{
- return bt_ctf_validate_identifier(identifier);
+ return bt_validate_identifier(identifier) == 0;
}