X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Finteger-range-set.c;h=8853d702be9f9064e8f54e74827c3e9f28a2a201;hb=d98421f2abfc5adab28ab7ee9b63537a6c7261cc;hp=d919cf727960b9b3663a35f93e5ff1f873af3300;hpb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;p=babeltrace.git

diff --git a/src/lib/integer-range-set.c b/src/lib/integer-range-set.c
index d919cf72..8853d702 100644
--- a/src/lib/integer-range-set.c
+++ b/src/lib/integer-range-set.c
@@ -1,30 +1,17 @@
 /*
- * Copyright 2019 Philippe Proulx <pproulx@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.
+ * SPDX-License-Identifier: MIT
  *
- * 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.
+ * Copyright 2019 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_LOG_TAG "LIB/INT-RANGE-SET"
 #include "lib/logging.h"
 
+#include <stdbool.h>
+
 #include <babeltrace2/babeltrace.h>
-#include "lib/assert-pre.h"
+
+#include "lib/assert-cond.h"
 #include "common/assert.h"
 #include "func-status.h"
 #include "integer-range-set.h"
@@ -177,14 +164,19 @@ end:
 
 struct bt_integer_range_set_unsigned *bt_integer_range_set_unsigned_create(void)
 {
+	BT_ASSERT_PRE_NO_ERROR();
+
 	return (void *) create_range_set();
 }
 
 struct bt_integer_range_set_signed *bt_integer_range_set_signed_create(void)
 {
+	BT_ASSERT_PRE_NO_ERROR();
+
 	return (void *) create_range_set();
 }
 
+static
 void add_range_to_range_set(struct bt_integer_range_set *range_set,
 		uint64_t u_lower, uint64_t u_upper)
 {
@@ -207,6 +199,7 @@ bt_integer_range_set_unsigned_add_range(
 		struct bt_integer_range_set_unsigned *range_set,
 		uint64_t lower, uint64_t upper)
 {
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE(lower <= upper,
 		"Range's upper bound is less than lower bound: "
 		"upper=%" PRIu64 ", lower=%" PRIu64, lower, upper);
@@ -219,6 +212,7 @@ bt_integer_range_set_signed_add_range(
 		struct bt_integer_range_set_signed *range_set,
 		int64_t lower, int64_t upper)
 {
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE(lower <= upper,
 		"Range's upper bound is less than lower bound: "
 		"upper=%" PRId64 ", lower=%" PRId64, lower, upper);