From 1361a1209418c4cb921125a16ac3642b46cca57b Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sat, 27 Jan 2018 11:27:12 +0100 Subject: [PATCH] spa-node: use new function to parse arguments --- src/modules/spa/module-node.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/modules/spa/module-node.c b/src/modules/spa/module-node.c index 8c43b3d14..8265f01ab 100644 --- a/src/modules/spa/module-node.c +++ b/src/modules/spa/module-node.c @@ -57,7 +57,7 @@ int pipewire__module_init(struct pw_module *module, const char *args) { struct pw_properties *props = NULL; char **argv; - int i, n_tokens; + int n_tokens; struct pw_core *core = pw_module_get_core(module); struct pw_node *node; struct node_data *data; @@ -65,23 +65,14 @@ int pipewire__module_init(struct pw_module *module, const char *args) if (args == NULL) goto wrong_arguments; - argv = pw_split_strv(args, " \t", INT_MAX, &n_tokens); + argv = pw_split_strv(args, " \t", 4, &n_tokens); if (n_tokens < 3) goto not_enough_arguments; - props = pw_properties_new(NULL, NULL); - if (props == NULL) - return -ENOMEM; - - for (i = 3; i < n_tokens; i++) { - char **prop; - int n_props; - - prop = pw_split_strv(argv[i], "=", INT_MAX, &n_props); - if (n_props >= 2) - pw_properties_set(props, prop[0], prop[1]); - - pw_free_strv(prop); + if (n_tokens == 4) { + props = pw_properties_new_string(argv[3]); + if (props == NULL) + return -ENOMEM; } node = pw_spa_node_load(core,