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

diff --git a/src/lib/util.c b/src/lib/util.c
index af2d1a4a..e52a956c 100644
--- a/src/lib/util.c
+++ b/src/lib/util.c
@@ -1,23 +1,7 @@
 /*
- * 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:
+ * 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 (c) 2015-2018 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_LOG_TAG "LIB/UTIL"
@@ -42,6 +26,7 @@ bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles,
 		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);