Fix: lib: pass down API function name to some helpers

[babeltrace.git] / src / lib / util.c

diff --git a/src/lib/util.c b/src/lib/util.c
index 3ba4c47611862ed9a7edcfab991788d51bda14c1..49d39f0b183a2352899f7f838d3befac1ac3ddbf 100644 (file)
--- a/src/lib/util.c
+++ b/src/lib/util.c
@@ -1,32 +1,16 @@
 /*
- * Copyright (c) 2015-2018 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 (c) 2015-2018 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_LOG_TAG "LIB/UTIL"
 #include "lib/logging.h"
 
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string.h>
 #include <inttypes.h>
 #include <babeltrace2/babeltrace.h>
 #include "lib/trace-ir/utils.h"
@@ -42,10 +26,14 @@ bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles,
                BT_FUNC_STATUS_OK;
        int ret;
 
-       BT_ASSERT_PRE_NON_NULL(ns, "Nanoseconds (output)");
-       BT_ASSERT_PRE(frequency != UINT64_C(-1) && frequency != 0,
+       BT_ASSERT_PRE_NO_ERROR();
+       BT_ASSERT_PRE_NON_NULL("nanoseconds-output", ns,
+               "Nanoseconds (output)");
+       BT_ASSERT_PRE("valid-frequency",
+               frequency != UINT64_C(-1) && frequency != 0,
                "Invalid frequency: freq=%" PRIu64, frequency);
-       BT_ASSERT_PRE(offset_cycles < frequency,
+       BT_ASSERT_PRE("offset-cycles-lt-frequency",
+               offset_cycles < frequency,
                "Offset (cycles) is greater than frequency: "
                "offset-cycles=%" PRIu64 ", freq=%" PRIu64,
                offset_cycles, frequency);