.gitignore: add some more IDE / tools related file

[babeltrace.git] / src / ctf-writer / assert-pre.h

diff --git a/src/ctf-writer/assert-pre.h b/src/ctf-writer/assert-pre.h
index c0a24614c10d90905b6fef7c85b6d77513e401e7..a118841d831f980d8581ac843c7d97212e024475 100644 (file)
--- a/src/ctf-writer/assert-pre.h
+++ b/src/ctf-writer/assert-pre.h
@@ -1,29 +1,13 @@
-#ifndef BABELTRACE_CTF_WRITER_ASSERT_PRE_INTERNAL_H
-#define BABELTRACE_CTF_WRITER_ASSERT_PRE_INTERNAL_H
-
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright (c) 2018 EfficiOS Inc. and Linux Foundation
  * Copyright (c) 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.
- *
- * 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.
  */
 
+#ifndef BABELTRACE_CTF_WRITER_ASSERT_PRE_H
+#define BABELTRACE_CTF_WRITER_ASSERT_PRE_H
+
 /*
  * The macros in this header use macros defined in "logging/log.h". We
  * don't want this header to automatically include "logging/log.h"
@@ -39,6 +23,7 @@
 # error Include "logging/log.h" before this header.
 #endif
 
+#include <stdbool.h>
 #include <stdlib.h>
 #include <inttypes.h>
 #include "common/macros.h"
@@ -73,7 +58,7 @@
  */
 # define BT_CTF_ASSERT_PRE_MSG(_fmt, ...)                              \
        do {                                                            \
-               _bt_log_write_d(_BT_LOG_SRCLOC_FUNCTION, __FILE__,      \
+               bt_log_write_printf(__FILE__, __func__,                 \
                        __LINE__, BT_LOG_FATAL, BT_LOG_TAG, (_fmt),     \
                        ##__VA_ARGS__);                                 \
        } while (0)
@@ -85,7 +70,7 @@
  * arguments using BT_LOGF(), and abort.
  *
  * To assert that a postcondition is satisfied or that some internal
- * object/context/value is in the expected state, use BT_ASSERT().
+ * object/context/value is in the expected state, use BT_ASSERT_DBG().
  */
 # define BT_CTF_ASSERT_PRE(_cond, _fmt, ...)                           \
        do {                                                            \
@@ -93,7 +78,7 @@
                        BT_CTF_ASSERT_PRE_MSG("CTF writer precondition not satisfied; error is:"); \
                        BT_CTF_ASSERT_PRE_MSG((_fmt), ##__VA_ARGS__);   \
                        BT_CTF_ASSERT_PRE_MSG("Aborting...");           \
-                       abort();                                        \
+                       bt_common_abort();                                      \
                }                                                       \
        } while (0)
 
@@ -139,7 +124,7 @@
  * Developer mode: asserts that a given variable is not NULL.
  */
 #define BT_CTF_ASSERT_PRE_NON_NULL(_obj, _obj_name)                            \
-       BT_CTF_ASSERT_PRE((_obj) != NULL, "%s is NULL: ", _obj_name)
+       BT_CTF_ASSERT_PRE((_obj), "%s is NULL: ", _obj_name)
 
 /*
  * Developer mode: asserts that a given object is NOT frozen. This macro
@@ -157,4 +142,4 @@
                "Index is out of bounds: index=%" PRIu64 ", "           \
                "count=%" PRIu64, (uint64_t) (_index), (uint64_t) (_length))
 
-#endif /* BABELTRACE_CTF_WRITER_ASSERT_PRE_INTERNAL_H */
+#endif /* BABELTRACE_CTF_WRITER_ASSERT_PRE_H */