From bd1a54fe26dea99d5f46714827d6c2fa970810bd Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 4 Mar 2019 16:47:41 -0500 Subject: [PATCH] common-internal.h: prefix functions with `bt_common_` Signed-off-by: Philippe Proulx --- include/babeltrace/common-internal.h | 4 ++-- lib/graph/iterator.c | 6 +++--- plugins/utils/muxer/muxer.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/babeltrace/common-internal.h b/include/babeltrace/common-internal.h index 306fd9bd..05dabfc4 100644 --- a/include/babeltrace/common-internal.h +++ b/include/babeltrace/common-internal.h @@ -432,7 +432,7 @@ const char *bt_common_value_type_string(enum bt_value_type type) }; static inline -GString *bt_field_path_string(struct bt_field_path *path) +GString *bt_common_field_path_string(struct bt_field_path *path) { GString *str = g_string_new(NULL); uint64_t i; @@ -458,7 +458,7 @@ end: } static inline -const char *bt_self_message_iterator_status_string( +const char *bt_common_self_message_iterator_status_string( enum bt_self_message_iterator_status status) { switch (status) { diff --git a/lib/graph/iterator.c b/lib/graph/iterator.c index ef627e3a..01c21128 100644 --- a/lib/graph/iterator.c +++ b/lib/graph/iterator.c @@ -975,7 +975,7 @@ bt_self_component_port_input_message_iterator_seek_beginning( status == BT_MESSAGE_ITERATOR_STATUS_NOMEM || status == BT_MESSAGE_ITERATOR_STATUS_AGAIN, "Unexpected status: %![iter-]+i, status=%s", - iterator, bt_self_message_iterator_status_string(status)); + iterator, bt_common_self_message_iterator_status_string(status)); set_iterator_state_after_seeking(iterator, status); return status; } @@ -1359,7 +1359,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( status == BT_MESSAGE_ITERATOR_STATUS_AGAIN, "Unexpected status: %![iter-]+i, status=%s", iterator, - bt_self_message_iterator_status_string(status)); + bt_common_self_message_iterator_status_string(status)); } else { /* Start automatic seeking: seek beginning first */ BT_ASSERT(iterator->methods.can_seek_beginning(iterator)); @@ -1375,7 +1375,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( status == BT_MESSAGE_ITERATOR_STATUS_AGAIN, "Unexpected status: %![iter-]+i, status=%s", iterator, - bt_self_message_iterator_status_string(status)); + bt_common_self_message_iterator_status_string(status)); switch (status) { case BT_MESSAGE_ITERATOR_STATUS_OK: break; diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c index ad285dfe..9fb1ae20 100644 --- a/plugins/utils/muxer/muxer.c +++ b/plugins/utils/muxer/muxer.c @@ -1000,11 +1000,11 @@ bt_self_message_iterator_status muxer_msg_iter_do_next_one( if (status < 0) { BT_LOGE("Cannot find the youngest upstream message iterator wrapper: " "status=%s", - bt_self_message_iterator_status_string(status)); + bt_common_self_message_iterator_status_string(status)); } else { BT_LOGV("Cannot find the youngest upstream message iterator wrapper: " "status=%s", - bt_self_message_iterator_status_string(status)); + bt_common_self_message_iterator_status_string(status)); } goto end; @@ -1300,11 +1300,11 @@ bt_self_message_iterator_status muxer_msg_iter_next( "comp-addr=%p, muxer-comp-addr=%p, muxer-msg-iter-addr=%p, " "msg-iter-addr=%p, status=%s", self_comp, muxer_comp, muxer_msg_iter, self_msg_iter, - bt_self_message_iterator_status_string(status)); + bt_common_self_message_iterator_status_string(status)); } else { BT_LOGV("Returning from muxer component's message iterator's \"next\" method: " "status=%s", - bt_self_message_iterator_status_string(status)); + bt_common_self_message_iterator_status_string(status)); } return status; -- 2.34.1