Move to kernel style SPDX license identifiers

[babeltrace.git] / src / ctf-writer / utils.c

diff --git a/src/ctf-writer/utils.c b/src/ctf-writer/utils.c
index b63883e43bab0d5149a9c3b5299f95541ed1238f..0cfb5742b510fc0a24b62e9a0f0911ae89702b7f 100644 (file)
--- a/src/ctf-writer/utils.c
+++ b/src/ctf-writer/utils.c
@@ -1,39 +1,19 @@
 /*
- * utils.c
- *
- * Babeltrace CTF writer - Utilities
+ * SPDX-License-Identifier: MIT
  *
  * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * 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.
- *
- * 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.
+ * Babeltrace CTF writer - Utilities
  */
 
-#define BT_LOG_TAG "CTF-WRITER-UTILS"
+#define BT_LOG_TAG "CTF-WRITER/UTILS"
 #include "logging.h"
 
 #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 +42,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 +62,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_LOGV_STR("Invalid parameter: input string is NULL.");
-               is_valid = BT_FALSE;
+               BT_LOGT_STR("Invalid parameter: input string is NULL.");
+               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 +93,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;
                }