From 4030a9244c9c2a5969aed56ee46adad4170ddc5e Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 21 Apr 2020 10:42:13 -0400 Subject: [PATCH] lib: rename BT_ASSERT_PRE_BEGIN_LE_END() -> BT_..._MSG_CS_BEGIN_LE_END() This adds a namespace as BT_ASSERT_PRE_MSG_CS_BEGIN_LE_END() is now part of the common `assert-cond.h` header. Signed-off-by: Philippe Proulx Change-Id: I5f3197a41b240f58fb7da5518053c792aab5da9d Reviewed-on: https://review.lttng.org/c/babeltrace/+/3440 --- src/lib/assert-cond.h | 2 +- src/lib/graph/message/discarded-items.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/assert-cond.h b/src/lib/assert-cond.h index 317ba23b..4de066b3 100644 --- a/src/lib/assert-cond.h +++ b/src/lib/assert-cond.h @@ -549,7 +549,7 @@ #define BT_ASSERT_PRE_DEV_MSG_NON_NULL(_msg_iter) \ BT_ASSERT_PRE_DEV_NON_NULL(_msg_iter, _BT_ASSERT_PRE_MSG_NAME) -#define BT_ASSERT_PRE_BEGIN_LE_END(_msg_iter, _begin, _end) \ +#define BT_ASSERT_PRE_MSG_CS_BEGIN_LE_END(_msg_iter, _begin, _end) \ BT_ASSERT_PRE( \ _begin <= _end, \ "Beginning default clock snapshot value is greater " \ diff --git a/src/lib/graph/message/discarded-items.c b/src/lib/graph/message/discarded-items.c index 975d22d7..53420e93 100644 --- a/src/lib/graph/message/discarded-items.c +++ b/src/lib/graph/message/discarded-items.c @@ -214,7 +214,7 @@ struct bt_message *bt_message_discarded_events_create_with_default_clock_snapsho uint64_t end_raw_value) { BT_ASSERT_PRE_DEV_NO_ERROR(); - BT_ASSERT_PRE_BEGIN_LE_END(message_iterator, + BT_ASSERT_PRE_MSG_CS_BEGIN_LE_END(message_iterator, beginning_raw_value, end_raw_value); return create_discarded_items_message(message_iterator, @@ -293,7 +293,7 @@ struct bt_message *bt_message_discarded_packets_create_with_default_clock_snapsh uint64_t end_raw_value) { BT_ASSERT_PRE_DEV_NO_ERROR(); - BT_ASSERT_PRE_BEGIN_LE_END(message_iterator, + BT_ASSERT_PRE_MSG_CS_BEGIN_LE_END(message_iterator, beginning_raw_value, end_raw_value); return create_discarded_items_message(message_iterator, -- 2.34.1