Move to kernel style SPDX license identifiers

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

diff --git a/src/lib/util.c b/src/lib/util.c
index 250ce8a413aa07c1485d80a9642fab39cdc62482..e52a956c94b7b99cf646b913127f0e7fa7d824f5 100644 (file)
--- a/src/lib/util.c
+++ b/src/lib/util.c
@@ -1,45 +1,32 @@
 /*
- * 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/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_NO_ERROR();
        BT_ASSERT_PRE_NON_NULL(ns, "Nanoseconds (output)");
        BT_ASSERT_PRE(frequency != UINT64_C(-1) && frequency != 0,
                "Invalid frequency: freq=%" PRIu64, frequency);
@@ -51,7 +38,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 +46,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: