X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Futil.c;h=af2d1a4a61a4d63dc71006a66d2e5cd19b010a47;hb=c4f23e30bf67d2523163614bc9461d84cbe1ae80;hp=250ce8a413aa07c1485d80a9642fab39cdc62482;hpb=350ad6c1c5f45a4e90c33e3c1354125c209bbf02;p=babeltrace.git

diff --git a/src/lib/util.c b/src/lib/util.c
index 250ce8a4..af2d1a4a 100644
--- a/src/lib/util.c
+++ b/src/lib/util.c
@@ -21,23 +21,25 @@
  */
 
 #define BT_LOG_TAG "LIB/UTIL"
-#include "lib/lib-logging.h"
+#include "lib/logging.h"
 
 #include "lib/assert-pre.h"
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string.h>
 #include <inttypes.h>
-#include <babeltrace2/util.h>
+#include <babeltrace2/babeltrace.h>
 #include "lib/trace-ir/utils.h"
 
-bt_util_status bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles,
+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,
 		uint64_t offset_cycles, int64_t *ns)
 {
 	bool overflows;
 	int64_t base_offset_ns;
-	bt_util_status status = BT_UTIL_STATUS_OK;
+	bt_util_clock_cycles_to_ns_from_origin_status status =
+		BT_FUNC_STATUS_OK;
 	int ret;
 
 	BT_ASSERT_PRE_NON_NULL(ns, "Nanoseconds (output)");
@@ -51,7 +53,7 @@ bt_util_status bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles,
 	overflows = bt_util_get_base_offset_ns(offset_seconds, offset_cycles,
 		frequency, &base_offset_ns);
 	if (overflows) {
-		status = BT_UTIL_STATUS_OVERFLOW;
+		status = BT_FUNC_STATUS_OVERFLOW_ERROR;
 		goto end;
 	}
 
@@ -59,7 +61,7 @@ bt_util_status bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles,
 		offset_seconds, offset_cycles,
 		frequency, cycles, ns);
 	if (ret) {
-		status = BT_UTIL_STATUS_OVERFLOW;
+		status = BT_FUNC_STATUS_OVERFLOW_ERROR;
 	}
 
 end: