X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fctf-writer%2Fclock-class.c;h=8f185cfa5ae7b484d5f6dc8d5f319fa4465511b5;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hp=d186f89a67d4ab95a7660c2742cb17d4e242ff94;hpb=6162e6b7a6d907974d954419c2375f654f39eb72;p=babeltrace.git

diff --git a/src/ctf-writer/clock-class.c b/src/ctf-writer/clock-class.c
index d186f89a..8f185cfa 100644
--- a/src/ctf-writer/clock-class.c
+++ b/src/ctf-writer/clock-class.c
@@ -1,40 +1,21 @@
 /*
- * clock-class.c
- *
- * Babeltrace CTF writer - Clock class
+ * SPDX-License-Identifier: MIT
  *
  * Copyright 2013, 2014 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 - Clock class
  */
 
 #define BT_LOG_TAG "CTF-WRITER/CLOCK-CLASS"
 #include "logging.h"
 
 #include "common/uuid.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 "compat/compiler.h"
 #include <babeltrace2/types.h>
 #include "compat/string.h"
+#include <stdbool.h>
 #include <inttypes.h>
 #include "common/assert.h"
 
@@ -46,7 +27,7 @@ static
 void bt_ctf_clock_class_destroy(struct bt_ctf_object *obj);
 
 BT_HIDDEN
-bt_bool bt_ctf_clock_class_is_valid(struct bt_ctf_clock_class *clock_class)
+bt_ctf_bool bt_ctf_clock_class_is_valid(struct bt_ctf_clock_class *clock_class)
 {
 	return clock_class && clock_class->name;
 }
@@ -412,7 +393,7 @@ end:
 }
 
 BT_HIDDEN
-bt_bool bt_ctf_clock_class_is_absolute(struct bt_ctf_clock_class *clock_class)
+bt_ctf_bool bt_ctf_clock_class_is_absolute(struct bt_ctf_clock_class *clock_class)
 {
 	int ret = -1;
 
@@ -428,7 +409,7 @@ end:
 
 BT_HIDDEN
 int bt_ctf_clock_class_set_is_absolute(struct bt_ctf_clock_class *clock_class,
-		bt_bool is_absolute)
+		bt_ctf_bool is_absolute)
 {
 	int ret = 0;
 
@@ -545,8 +526,8 @@ int bt_ctf_clock_class_compare(struct bt_ctf_clock_class *clock_class_a,
 		struct bt_ctf_clock_class *clock_class_b)
 {
 	int ret = 1;
-	BT_ASSERT(clock_class_a);
-	BT_ASSERT(clock_class_b);
+	BT_ASSERT_DBG(clock_class_a);
+	BT_ASSERT_DBG(clock_class_b);
 
 	/* Name */
 	if (strcmp(clock_class_a->name->str, clock_class_b->name->str) != 0) {