Always evaluate BT_ASSERT(); add BT_ASSERT_DBG() for debug mode only

[babeltrace.git] / src / lib / graph / message / message.h

diff --git a/src/lib/graph/message/message.h b/src/lib/graph/message/message.h
index 75515ef8f41ffc224033fde627bd59ffc44eb0a7..f290e3fda6b2a8c0e99b4da52cc09f2204914a09 100644 (file)
--- a/src/lib/graph/message/message.h
+++ b/src/lib/graph/message/message.h
@@ -82,7 +82,7 @@ void bt_message_init(struct bt_message *message,
 static inline
 void bt_message_reset(struct bt_message *message)
 {
-       BT_ASSERT(message);
+       BT_ASSERT_DBG(message);
 
 #ifdef BT_DEV_MODE
        message->frozen = BT_FALSE;
@@ -134,19 +134,19 @@ const char *bt_message_type_string(enum bt_message_type type)
 {
        switch (type) {
        case BT_MESSAGE_TYPE_EVENT:
-               return "BT_MESSAGE_TYPE_EVENT";
+               return "EVENT";
        case BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY:
-               return "BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY";
+               return "MESSAGE_ITERATOR_INACTIVITY";
        case BT_MESSAGE_TYPE_STREAM_BEGINNING:
-               return "BT_MESSAGE_TYPE_STREAM_BEGINNING";
+               return "STREAM_BEGINNING";
        case BT_MESSAGE_TYPE_STREAM_END:
-               return "BT_MESSAGE_TYPE_STREAM_END";
+               return "STREAM_END";
        case BT_MESSAGE_TYPE_PACKET_BEGINNING:
-               return "BT_MESSAGE_TYPE_PACKET_BEGINNING";
+               return "PACKET_BEGINNING";
        case BT_MESSAGE_TYPE_PACKET_END:
-               return "BT_MESSAGE_TYPE_PACKET_END";
+               return "PACKET_END";
        case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
-               return "BT_MESSAGE_TYPE_DISCARDED_EVENTS";
+               return "DISCARDED_EVENTS";
        default:
                return "(unknown)";
        }