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 <eeppeliteloop@gmail.com>

diff --git a/cli/babeltrace-cfg-cli-args.c b/cli/babeltrace-cfg-cli-args.c
index f8c751045f019517dfcad75202ba9e3504c63f7c..04f39414a2e37bf4c1cb4793d7d66f892a25f306 100644 (file)
--- 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(&params_to_set,
-                               cur_cfg_comp->params,
-                               params);
+                       status = bt_value_map_extend(cur_cfg_comp->params,
+                               params, &params_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 7aec02782e4f2715c70c11f1b5d487eedf8fe0fb..f78915b7b8fecf4a0e64b113abf52e9ceed3cc98 100644 (file)
--- 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 afbabc656de617862b6421a2e5be12b53f7705e7..0b8a8f2f2a76f03e4bfa6ac7fe8564943e2cff1c 100644 (file)
--- 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 a661575fa26ec53ebd0f5c2e6e1a0c6e4d44f4d8..c75ed207d9f8a3ff6ff960bbb6507ca3fc86bb5f 100644 (file)
--- 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 6a6ca7c3560a433a48ee4c7882cade7722195deb..96d53d1e5ee059cbb4d853a3cbf6d0238eb1c072 100644 (file)
--- 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,