From c61018b99a23cc27bdef92fe2b8a363ff85e311a Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Wed, 15 May 2019 18:08:18 -0400 Subject: [PATCH] Cleanup: flt.utils.muxer: avoid returning a pointer needlessly MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reshuffle `muxer_msg_iter_add_upstream_msg_iter()` function to return an int rather than a pointer. Returning a pointer in this case has no value since the newly allocated structure is stored in a GQueue directly. Returning an int to express success or error seems more appropriate and less error-prone. Signed-off-by: Francis Deslauriers Change-Id: I111cd06e1f667c98aa3bf650375c6e49fcd4c5dd Reviewed-on: https://review.lttng.org/c/babeltrace/+/1313 Tested-by: jenkins Reviewed-by: Jérémie Galarneau --- plugins/utils/muxer/muxer.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c index 47d790b3..7162a6c9 100644 --- a/plugins/utils/muxer/muxer.c +++ b/plugins/utils/muxer/muxer.c @@ -138,10 +138,10 @@ void destroy_muxer_upstream_msg_iter( } static -struct muxer_upstream_msg_iter *muxer_msg_iter_add_upstream_msg_iter( - struct muxer_msg_iter *muxer_msg_iter, +int muxer_msg_iter_add_upstream_msg_iter(struct muxer_msg_iter *muxer_msg_iter, bt_self_component_port_input_message_iterator *self_msg_iter) { + int ret = 0; struct muxer_upstream_msg_iter *muxer_upstream_msg_iter = g_new0(struct muxer_upstream_msg_iter, 1); @@ -169,10 +169,10 @@ struct muxer_upstream_msg_iter *muxer_msg_iter_add_upstream_msg_iter( error: g_free(muxer_upstream_msg_iter); - muxer_upstream_msg_iter = NULL; + ret = -1; end: - return muxer_upstream_msg_iter; + return ret; } static @@ -1206,7 +1206,6 @@ int muxer_msg_iter_init_upstream_iterators(struct muxer_comp *muxer_comp, for (i = 0; i < count; i++) { bt_self_component_port_input_message_iterator *upstream_msg_iter; - struct muxer_upstream_msg_iter *muxer_upstream_msg_iter; bt_self_component_port_input *self_port = bt_self_component_filter_borrow_input_port_by_index( muxer_comp->self_comp, i); @@ -1231,14 +1230,12 @@ int muxer_msg_iter_init_upstream_iterators(struct muxer_comp *muxer_comp, goto end; } - muxer_upstream_msg_iter = - muxer_msg_iter_add_upstream_msg_iter( - muxer_msg_iter, upstream_msg_iter); + ret = muxer_msg_iter_add_upstream_msg_iter(muxer_msg_iter, + upstream_msg_iter); bt_self_component_port_input_message_iterator_put_ref( upstream_msg_iter); - if (!muxer_upstream_msg_iter) { + if (ret) { /* muxer_msg_iter_add_upstream_msg_iter() logs errors */ - ret = -1; goto end; } } -- 2.34.1