From 35294e839bb0dd4287b520e68a5ef0362d62092c Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 7 Dec 2018 15:30:01 -0500 Subject: [PATCH] bt_value_map_extend(): put output parameter as last parameter To remain consistent, make the first parameter the main object on which we're working. Signed-off-by: Philippe Proulx --- cli/babeltrace-cfg-cli-args.c | 5 ++--- include/babeltrace/values-const.h | 4 ++-- lib/values.c | 4 ++-- plugins/utils/muxer/muxer.c | 3 +-- tests/lib/test_bt_values.c | 5 +---- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/cli/babeltrace-cfg-cli-args.c b/cli/babeltrace-cfg-cli-args.c index f8c75104..04f39414 100644 --- a/cli/babeltrace-cfg-cli-args.c +++ b/cli/babeltrace-cfg-cli-args.c @@ -2533,9 +2533,8 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[], goto error; } - status = bt_value_map_extend(¶ms_to_set, - cur_cfg_comp->params, - params); + status = bt_value_map_extend(cur_cfg_comp->params, + params, ¶ms_to_set); BT_OBJECT_PUT_REF_AND_RESET(params); if (status != BT_VALUE_STATUS_OK) { printf_err("Cannot extend current component parameters with --params option's argument:\n %s\n", diff --git a/include/babeltrace/values-const.h b/include/babeltrace/values-const.h index 7aec0278..f78915b7 100644 --- a/include/babeltrace/values-const.h +++ b/include/babeltrace/values-const.h @@ -161,9 +161,9 @@ extern bt_bool bt_value_map_has_entry(const struct bt_value *map_obj, const char *key); extern enum bt_value_status bt_value_map_extend( - struct bt_value **extended_map_obj, const struct bt_value *base_map_obj, - const struct bt_value *extension_map_obj); + const struct bt_value *extension_map_obj, + struct bt_value **extended_map_obj); #ifdef __cplusplus } diff --git a/lib/values.c b/lib/values.c index afbabc65..0b8a8f2f 100644 --- a/lib/values.c +++ b/lib/values.c @@ -1196,9 +1196,9 @@ end: } enum bt_value_status bt_value_map_extend( - struct bt_value **extended_map_obj, const struct bt_value *base_map_obj, - const struct bt_value *extension_obj) + const struct bt_value *extension_obj, + struct bt_value **extended_map_obj) { struct extend_map_element_data extend_data = { .extended_obj = NULL, diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c index a661575f..c75ed207 100644 --- a/plugins/utils/muxer/muxer.c +++ b/plugins/utils/muxer/muxer.c @@ -288,8 +288,7 @@ int configure_muxer_comp(struct muxer_comp *muxer_comp, goto error; } - ret = bt_value_map_extend(&real_params, - default_params, params); + ret = bt_value_map_extend(default_params, params, &real_params); if (ret) { BT_LOGE("Cannot extend default parameters map value: " "muxer-comp-addr=%p, def-params-addr=%p, " diff --git a/tests/lib/test_bt_values.c b/tests/lib/test_bt_values.c index 6a6ca7c3..96d53d1e 100644 --- a/tests/lib/test_bt_values.c +++ b/tests/lib/test_bt_values.c @@ -977,10 +977,7 @@ void test_extend(void) status = bt_value_map_insert_real_entry(extension_map, "project", -404); BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_extend( - &extended_map, - base_map, - extension_map); + status = bt_value_map_extend(base_map, extension_map, &extended_map); ok(status == BT_VALUE_STATUS_OK && extended_map, "bt_value_map_extend() succeeds"); ok(bt_value_map_get_size(extended_map) == 5, -- 2.34.1