Fix: bitfield: shift undefined/implementation defined behaviors

[babeltrace.git] / include / babeltrace / assert-pre-internal.h

diff --git a/include/babeltrace/assert-pre-internal.h b/include/babeltrace/assert-pre-internal.h
index cc412340f69bb0d119c32b5b319fc3270e7f55ed..e1a57dfe5df1dbecaca3f54cc7c3d0c051e340bf 100644 (file)
--- a/include/babeltrace/assert-pre-internal.h
+++ b/include/babeltrace/assert-pre-internal.h
@@ -33,14 +33,17 @@
  * also need to define it before including this header.
  *
  * This is a reminder that in order to use
- * <babeltrace/assert-internal.hpp>, you also need to use logging
+ * <babeltrace/assert-pre-internal.h>, you also need to use logging
  * explicitly.
  */
+
 #ifndef BABELTRACE_LIB_LOGGING_INTERNAL_H
 # error Include <babeltrace/lib-logging-internal.h> before this header.
 #endif
 
 #include <stdlib.h>
+#include <inttypes.h>
+#include <babeltrace/babeltrace-internal.h>
 
 #ifdef BT_DEV_MODE
 /*
@@ -55,7 +58,7 @@
 # define BT_ASSERT_PRE(_cond, _fmt, ...)                               \
        do {                                                            \
                if (!(_cond)) {                                         \
-                       BT_LOGF_STR("Library precondition not satisfied:"); \
+                       BT_LOGF_STR("Library precondition not satisfied; error is:"); \
                        BT_LIB_LOGF((_fmt), ##__VA_ARGS__);             \
                        BT_LOGF_STR("Aborting...");                     \
                        abort();                                        \
@@ -96,8 +99,8 @@
  */
 # define BT_ASSERT_PRE_MSG     BT_LIB_LOGF
 #else
-# define BT_ASSERT_PRE(_cond, _fmt, ...)
-# define BT_ASSERT_PRE_FUNC    __attribute__((unused))
+# define BT_ASSERT_PRE(_cond, _fmt, ...)       ((void) sizeof((void) (_cond), 0))
+# define BT_ASSERT_PRE_FUNC    BT_UNUSED
 # define BT_ASSERT_PRE_MSG(_fmt, ...)
 #endif /* BT_DEV_MODE */
 
@@ -115,4 +118,12 @@
        BT_ASSERT_PRE(!(_obj)->frozen, "%s is frozen" _fmt, _obj_name,  \
                ##__VA_ARGS__)
 
+/*
+ * Developer mode: asserts that a given index is less than a given size.
+ */
+#define BT_ASSERT_PRE_VALID_INDEX(_index, _length)                     \
+       BT_ASSERT_PRE((_index) < (_length),                             \
+               "Index is out of bounds: index=%" PRIu64 ", "           \
+               "count=%" PRIu64, (uint64_t) (_index), (uint64_t) (_length))
+
 #endif /* BABELTRACE_ASSERT_PRE_INTERNAL_H */