From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 22 Apr 2015 08:07:00 +0000 (+0200)
Subject: util: command: Deduplicate code in virCommandNewArgList
X-Git-Tag: v1.2.15-rc1~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64a9d2fa2f7259f936418f9d1fefe9ae46666b6f;p=thirdparty%2Flibvirt.git

util: command: Deduplicate code in virCommandNewArgList

virCommandNewArgList can use virCommandNewVAList.
---

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 648f5ed654..c41bd7f697 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -919,17 +919,13 @@ virCommandNewArgs(const char *const*args)
 virCommandPtr
 virCommandNewArgList(const char *binary, ...)
 {
-    virCommandPtr cmd = virCommandNew(binary);
+    virCommandPtr cmd;
     va_list list;
-    const char *arg;
-
-    if (!cmd || cmd->has_error)
-        return cmd;
 
     va_start(list, binary);
-    while ((arg = va_arg(list, const char *)) != NULL)
-        virCommandAddArg(cmd, arg);
+    cmd = virCommandNewVAList(binary, list);
     va_end(list);
+
     return cmd;
 }