Normalize C/C++ include guards

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

diff --git a/src/lib/util.c b/src/lib/util.c
index e52a956c94b7b99cf646b913127f0e7fa7d824f5..f635624ca15b7d757f8a2e76657f5c484d8d7c67 100644 (file)
--- a/src/lib/util.c
+++ b/src/lib/util.c
@@ -7,14 +7,13 @@
 #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 <inttypes.h>
 #include <babeltrace2/babeltrace.h>
 #include "lib/trace-ir/utils.h"
 
+BT_EXPORT
 bt_util_clock_cycles_to_ns_from_origin_status
 bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles,
                uint64_t frequency, int64_t offset_seconds,
@@ -27,10 +26,13 @@ bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles,
        int ret;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(ns, "Nanoseconds (output)");
-       BT_ASSERT_PRE(frequency != UINT64_C(-1) && frequency != 0,
+       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);
@@ -42,10 +44,8 @@ bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles,
                goto end;
        }
 
-       ret = bt_util_ns_from_origin_inline(base_offset_ns,
-               offset_seconds, offset_cycles,
-               frequency, cycles, ns);
-       if (ret) {
+        ret = bt_util_ns_from_origin_inline(base_offset_ns, frequency, cycles, ns);
+        if (ret) {
                status = BT_FUNC_STATUS_OVERFLOW_ERROR;
        }