lib: use common precond. assert. macros from `assert-cond.h` thru lib

[babeltrace.git] / src / lib / integer-range-set.c

diff --git a/src/lib/integer-range-set.c b/src/lib/integer-range-set.c
index 5175fe244d6bd9775dc5b7cabfe51ec056b82d11..2fe13ec5d10666f7278fc1302c75b04ee3ad1686 100644 (file)
--- 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:
+ * SPDX-License-Identifier: MIT
  *
- * 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.
+ * 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"
@@ -34,7 +21,7 @@ uint64_t bt_integer_range_unsigned_get_lower(
 {
        const struct bt_integer_range *range = (const void *) u_range;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(range, "Integer range");
+       BT_ASSERT_PRE_DEV_INT_RANGE_NON_NULL(range);
        return range->lower.u;
 }
 
@@ -43,7 +30,7 @@ uint64_t bt_integer_range_unsigned_get_upper(
 {
        const struct bt_integer_range *range = (const void *) u_range;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(range, "Integer range");
+       BT_ASSERT_PRE_DEV_INT_RANGE_NON_NULL(range);
        return range->upper.u;
 }
 
@@ -52,7 +39,7 @@ int64_t bt_integer_range_signed_get_lower(
 {
        const struct bt_integer_range *range = (const void *) i_range;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(range, "Integer range");
+       BT_ASSERT_PRE_DEV_INT_RANGE_NON_NULL(range);
        return range->lower.i;
 }
 
@@ -61,7 +48,7 @@ int64_t bt_integer_range_signed_get_upper(
 {
        const struct bt_integer_range *range = (const void *) i_range;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(range, "Integer range");
+       BT_ASSERT_PRE_DEV_INT_RANGE_NON_NULL(range);
        return range->upper.i;
 }
 
@@ -96,7 +83,7 @@ bt_bool bt_integer_range_signed_is_equal(
 uint64_t bt_integer_range_set_get_range_count(
                const bt_integer_range_set *range_set)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(range_set, "Integer range set");
+       BT_ASSERT_PRE_DEV_INT_RANGE_SET_NON_NULL(range_set);
        return (uint64_t) range_set->ranges->len;
 }
 
@@ -108,7 +95,7 @@ bt_integer_range_set_unsigned_borrow_range_by_index_const(
        const struct bt_integer_range_set *range_set =
                (const void *) u_range_set;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(range_set, "Integer range set");
+       BT_ASSERT_PRE_DEV_INT_RANGE_SET_NON_NULL(range_set);
        BT_ASSERT_PRE_DEV_VALID_INDEX(index, range_set->ranges->len);
        return (const void *) BT_INTEGER_RANGE_SET_RANGE_AT_INDEX(range_set,
                index);
@@ -121,7 +108,7 @@ bt_integer_range_set_signed_borrow_range_by_index_const(
        const struct bt_integer_range_set *range_set =
                (const void *) i_range_set;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(range_set, "Integer range set");
+       BT_ASSERT_PRE_DEV_INT_RANGE_SET_NON_NULL(range_set);
        BT_ASSERT_PRE_DEV_VALID_INDEX(index, range_set->ranges->len);
        return (const void *) BT_INTEGER_RANGE_SET_RANGE_AT_INDEX(range_set,
                index);
@@ -177,11 +164,15 @@ 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();
 }
 
@@ -194,7 +185,7 @@ void add_range_to_range_set(struct bt_integer_range_set *range_set,
                .upper.u = u_upper,
        };
 
-       BT_ASSERT_PRE_NON_NULL(range_set, "Integer range set");
+       BT_ASSERT_PRE_INT_RANGE_SET_NON_NULL(range_set);
        BT_ASSERT_PRE_DEV_HOT(range_set, "Integer range set", ": %!+R",
                range_set);
        g_array_append_val(range_set->ranges, range);
@@ -208,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);
@@ -220,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);