lib: merge `assert-pre.h` and `assert-post.h` into `assert-cond.h`

[babeltrace.git] / src / lib / lib-logging.c

diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c
index 88be5c769e6ac2b59fb953aa262bc2c5b508adfe..1730f6d09c93588f43f2388da579b0b820daa2e6 100644 (file)
--- a/src/lib/lib-logging.c
+++ b/src/lib/lib-logging.c
@@ -21,8 +21,7 @@
 #include <babeltrace2/babeltrace.h>
 
 #include "logging.h"
-#include "assert-pre.h"
-#include "assert-post.h"
+#include "assert-cond.h"
 #include "value.h"
 #include "integer-range-set.h"
 #include "object-pool.h"
@@ -58,7 +57,6 @@
 #include "trace-ir/trace.h"
 #include "trace-ir/utils.h"
 #include "error.h"
-#include "assert-pre.h"
 
 #define LIB_LOGGING_BUF_SIZE   (4096 * 4)
 
@@ -331,6 +329,8 @@ static inline void format_field_integer_extended(char **buf_ch,
                fmt = ", %svalue=%" PRIx64;
        }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
        if (field_class->common.type == BT_FIELD_CLASS_TYPE_SIGNED_INTEGER ||
                        field_class->common.type == BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION) {
                if (!fmt) {
@@ -345,6 +345,7 @@ static inline void format_field_integer_extended(char **buf_ch,
 
                BUF_APPEND(fmt, PRFIELD(integer->value.u));
        }
+#pragma GCC diagnostic pop
 }
 
 static inline void format_field(char **buf_ch, bool extended,