virCommandGetArgList: Remove 'nargs' argument

The returned argument list is a NULL-terminated string list and the only
caller doesn't use the count. Remove the argument.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 8e372c3152701bd982ffdbe8df83c84dbb357921..fead373729b7868ef63141b4e6d51e435d115143 100644 (file)
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -2164,8 +2164,7 @@ virCommandToString(virCommand *cmd,
 
 int
 virCommandGetArgList(virCommand *cmd,
-                     char ***args,
-                     size_t *nargs)
+                     char ***args)
 {
     size_t i;
 
@@ -2175,7 +2174,6 @@ virCommandGetArgList(virCommand *cmd,
     }
 
     *args = g_new0(char *, cmd->nargs);
-    *nargs = cmd->nargs - 1;
 
     for (i = 1; i < cmd->nargs; i++)
         (*args)[i - 1] = g_strdup(cmd->args[i]);

diff --git a/src/util/vircommand.h b/src/util/vircommand.h
index fb6c3b5d1215eb0245c6f600c825a90a9c82287b..600806a987def226e021f445ee3260b2b2a5a9cf 100644 (file)
--- a/src/util/vircommand.h
+++ b/src/util/vircommand.h
@@ -178,7 +178,7 @@ int virCommandToStringBuf(virCommand *cmd,
                           bool linebreaks,
                           bool stripCommandPath);
 
-int virCommandGetArgList(virCommand *cmd, char ***args, size_t *nargs);
+int virCommandGetArgList(virCommand *cmd, char ***args);
 
 int virCommandExec(virCommand *cmd, gid_t *groups, int ngroups) G_GNUC_WARN_UNUSED_RESULT;
 

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b5d4e6aa13fdecd5df59850f260b4e32d5fab3ee..a0358507b3db550363f7d668b3f7b891ce571641 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -558,7 +558,6 @@ testCompareXMLToArgvValidateSchema(virQEMUDriver *drv,
     g_auto(GStrv) args = NULL;
     g_autoptr(virDomainObj) vm = NULL;
     qemuDomainObjPrivate *priv = NULL;
-    size_t nargs = 0;
     GHashTable *schema = NULL;
     g_autoptr(virCommand) cmd = NULL;
     unsigned int parseFlags = info->parseFlags;
@@ -600,7 +599,7 @@ testCompareXMLToArgvValidateSchema(virQEMUDriver *drv,
     if (!(cmd = testCompareXMLToArgvCreateArgs(drv, vm, migrateURI, info, flags)))
         return -1;
 
-    if (virCommandGetArgList(cmd, &args, &nargs) < 0)
+    if (virCommandGetArgList(cmd, &args) < 0)
         return -1;
 
     if (testCompareXMLToArgvValidateSchemaCommand(args, schema) < 0)