From 9275bef4a2fa8fdcec24f4d9953b772c802897f9 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 3 Jul 2019 14:30:55 -0400 Subject: [PATCH] Fix compiler -Wall warnings (mostly incompatible enumerations) Signed-off-by: Philippe Proulx Change-Id: I399b4f8d69d116e057e4b7c89ae758744ec3f5a9 Reviewed-on: https://review.lttng.org/c/babeltrace/+/1605 Tested-by: jenkins --- src/cli/babeltrace2.c | 10 +++++----- src/lib/graph/component-class-sink-colander.c | 3 +-- src/lib/graph/component.c | 2 +- src/lib/graph/iterator.c | 2 +- src/plugins/ctf/fs-src/fs.c | 2 +- src/plugins/text/pretty/pretty.c | 4 ++-- src/plugins/utils/trimmer/trimmer.c | 5 ++--- 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c index 0b026f78..e5d4370c 100644 --- a/src/cli/babeltrace2.c +++ b/src/cli/babeltrace2.c @@ -2080,7 +2080,7 @@ static int cmd_run_ctx_init(struct cmd_run_ctx *ctx, struct bt_config *cfg) { int ret = 0; - bt_graph_add_component_status add_comp_status; + bt_graph_add_listener_status add_listener_status; ctx->cfg = cfg; ctx->connect_ports = false; @@ -2117,18 +2117,18 @@ int cmd_run_ctx_init(struct cmd_run_ctx *ctx, struct bt_config *cfg) } the_graph = ctx->graph; - add_comp_status = bt_graph_add_source_component_output_port_added_listener( + add_listener_status = bt_graph_add_source_component_output_port_added_listener( ctx->graph, graph_source_output_port_added_listener, NULL, ctx, NULL); - if (add_comp_status != BT_GRAPH_ADD_COMPONENT_STATUS_OK) { + if (add_listener_status != BT_GRAPH_ADD_LISTENER_STATUS_OK) { BT_LOGE_STR("Cannot add \"port added\" listener to graph."); goto error; } - add_comp_status = bt_graph_add_filter_component_output_port_added_listener( + add_listener_status = bt_graph_add_filter_component_output_port_added_listener( ctx->graph, graph_filter_output_port_added_listener, NULL, ctx, NULL); - if (add_comp_status != BT_GRAPH_ADD_COMPONENT_STATUS_OK) { + if (add_listener_status != BT_GRAPH_ADD_LISTENER_STATUS_OK) { BT_LOGE_STR("Cannot add \"port added\" listener to graph."); goto error; } diff --git a/src/lib/graph/component-class-sink-colander.c b/src/lib/graph/component-class-sink-colander.c index b68a3ab0..b1c4ee70 100644 --- a/src/lib/graph/component-class-sink-colander.c +++ b/src/lib/graph/component-class-sink-colander.c @@ -44,8 +44,7 @@ enum bt_component_class_init_method_status colander_init( struct bt_self_component_sink *self_comp, const struct bt_value *params, void *init_method_data) { - enum bt_component_class_init_method_status status = - BT_FUNC_STATUS_OK; + int status = BT_FUNC_STATUS_OK; struct bt_component_class_sink_colander_priv_data *colander_data = NULL; struct bt_component_class_sink_colander_data *user_provided_data = init_method_data; diff --git a/src/lib/graph/component.c b/src/lib/graph/component.c index 825d8963..24d7dede 100644 --- a/src/lib/graph/component.c +++ b/src/lib/graph/component.c @@ -491,7 +491,7 @@ bt_component_port_connected( typedef enum bt_component_class_port_connected_method_status (*method_t)( void *, void *, const void *); - enum bt_self_component_add_port_status status = + enum bt_component_class_port_connected_method_status status = BT_FUNC_STATUS_OK; method_t method = NULL; diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c index b1d57b59..86d7a1e4 100644 --- a/src/lib/graph/iterator.c +++ b/src/lib/graph/iterator.c @@ -1221,7 +1221,7 @@ enum bt_message_iterator_seek_beginning_status bt_self_component_port_input_message_iterator_seek_beginning( struct bt_self_component_port_input_message_iterator *iterator) { - enum bt_message_iterator_seek_beginning_status status; + int status; BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); BT_ASSERT_PRE_ITER_HAS_STATE_TO_SEEK(iterator); diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c index da5a1eb6..b9faf97a 100644 --- a/src/plugins/ctf/fs-src/fs.c +++ b/src/plugins/ctf/fs-src/fs.c @@ -260,7 +260,7 @@ bt_component_class_message_iterator_init_method_status ctf_fs_iterator_init( self_comp = port_data->ctf_fs->self_comp; msg_iter_data = g_new0(struct ctf_fs_msg_iter_data, 1); if (!msg_iter_data) { - ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_MEMORY_ERROR; + ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR; goto error; } diff --git a/src/plugins/text/pretty/pretty.c b/src/plugins/text/pretty/pretty.c index 0a85530e..089d4871 100644 --- a/src/plugins/text/pretty/pretty.c +++ b/src/plugins/text/pretty/pretty.c @@ -168,7 +168,7 @@ pretty_graph_is_configured(bt_self_component_sink *comp) bt_self_component_sink_borrow_input_port_by_name(comp, in_port_name)); if (!pretty->iterator) { - status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_MEMORY_ERROR; + status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_ERROR; } return status; @@ -211,7 +211,7 @@ bt_component_class_sink_consume_method_status pretty_consume( BT_ASSERT(next_status == BT_MESSAGE_ITERATOR_NEXT_STATUS_OK); for (i = 0; i < count; i++) { - ret = handle_message(pretty, msgs[i]); + ret = (int) handle_message(pretty, msgs[i]); if (ret) { goto end; } diff --git a/src/plugins/utils/trimmer/trimmer.c b/src/plugins/utils/trimmer/trimmer.c index 7d510bd9..d771ec27 100644 --- a/src/plugins/utils/trimmer/trimmer.c +++ b/src/plugins/utils/trimmer/trimmer.c @@ -814,7 +814,7 @@ state_set_trimmer_iterator_bounds( struct trimmer_iterator *trimmer_it) { bt_message_iterator_next_status upstream_iter_status = - BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK; + BT_MESSAGE_ITERATOR_NEXT_STATUS_OK; struct trimmer_comp *trimmer_comp = trimmer_it->trimmer_comp; bt_message_array_const msgs; uint64_t count = 0; @@ -886,8 +886,7 @@ found: error: put_messages(msgs, count); - upstream_iter_status = - BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR; + upstream_iter_status = BT_MESSAGE_ITERATOR_NEXT_STATUS_ERROR; end: return (int) upstream_iter_status; -- 2.34.1