libdaemon: config_make_nodes_v needs fixing

Put the change from commit #10d27998b3d2f6100e9e29e83d1d99948c55875f
back so we have working tree again for now. This code needs a bit of
a cleanup to return proper return value to check...

diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c
index d22df75b37e18ae48065c4b15676ce21614cae1c..60f0277b116fa70e2bb6bf629019ba02b0ccdf3d 100644 (file)
--- a/lib/cache/lvmetad.c
+++ b/lib/cache/lvmetad.c
@@ -148,13 +148,12 @@ static int _lvmetad_pvscan_all_devs(struct cmd_context *cmd, activation_handler
 static daemon_reply _lvmetad_send(const char *id, ...)
 {
        va_list ap;
-       daemon_reply repl;
+       daemon_reply repl = { 0 };
        daemon_request req;
        unsigned num_rescans = 0;
        unsigned total_usecs_waited = 0;
        unsigned max_remaining_sleep_times = 1;
        unsigned wait_usecs;
-       int r;
 
 retry:
        req = daemon_request_make(id);
@@ -165,12 +164,8 @@ retry:
        }
 
        va_start(ap, id);
-       r = daemon_request_extend_v(req, ap);
+       daemon_request_extend_v(req, ap);
        va_end(ap);
-       if (!r) {
-               repl.error = ENOMEM;
-               return repl;
-       }
 
        repl = daemon_send(_lvmetad, req);
 

diff --git a/libdaemon/client/config-util.c b/libdaemon/client/config-util.c
index 895815c316b3f5da2dfc9af09f288680620f2e1b..023257e2f4aa20446f4d69a4c3ab7010b83b5d03 100644 (file)
--- a/libdaemon/client/config-util.c
+++ b/libdaemon/client/config-util.c
@@ -208,6 +208,10 @@ struct dm_config_node *make_int_node(struct dm_config_tree *cft,
        return cn;
 }
 
+/*
+ * FIXME: return 1 even if VA list is empty and return the
+ *        dm_config_node* result as output parameter
+ */
 struct dm_config_node *config_make_nodes_v(struct dm_config_tree *cft,
                                           struct dm_config_node *parent,
                                           struct dm_config_node *pre_sib,