tools: Separate storage volume related completers into a file

Mixing all completers in one file does not support
maintainability. Separate those completers which relate to
storage volumes (e.g. they complete various storage volume
aspects) into virsh-completer-volume.c

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 38606f7a95f8b28f4ab38df970d8e344933d8acb..154619aab9e6ee47ef9e04a4d777e630e4ecc094 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -229,6 +229,7 @@ virsh_SOURCES = \
                virsh-completer.c virsh-completer.h \
                virsh-completer-domain.c virsh-completer-domain.h \
                virsh-completer-pool.c virsh-completer-pool.h \
+               virsh-completer-volume.c virsh-completer-volume.h \
                virsh-console.c virsh-console.h \
                virsh-domain.c virsh-domain.h \
                virsh-domain-monitor.c virsh-domain-monitor.h \

diff --git a/tools/virsh-completer-volume.c b/tools/virsh-completer-volume.c
new file mode 100644 (file)
index 0000000..2df0077
--- /dev/null
+++ b/tools/virsh-completer-volume.c
@@ -0,0 +1,73 @@
+/*
+ * virsh-completer-volume.c: virsh completer callbacks related to volumes
+ *
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+
+#include "virsh-completer-volume.h"
+#include "viralloc.h"
+#include "virsh-pool.h"
+#include "virsh.h"
+#include "virstring.h"
+
+char **
+virshStorageVolNameCompleter(vshControl *ctl,
+                             const vshCmd *cmd,
+                             unsigned int flags)
+{
+    virshControlPtr priv = ctl->privData;
+    virStoragePoolPtr pool = NULL;
+    virStorageVolPtr *vols = NULL;
+    int rc;
+    int nvols = 0;
+    size_t i = 0;
+    char **ret = NULL;
+    VIR_AUTOSTRINGLIST tmp = NULL;
+
+    virCheckFlags(0, NULL);
+
+    if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
+        return NULL;
+
+    if (!(pool = virshCommandOptPool(ctl, cmd, "pool", NULL)))
+        return NULL;
+
+    if ((rc = virStoragePoolListAllVolumes(pool, &vols, flags)) < 0)
+        goto cleanup;
+    nvols = rc;
+
+    if (VIR_ALLOC_N(tmp, nvols + 1) < 0)
+        goto cleanup;
+
+    for (i = 0; i < nvols; i++) {
+        const char *name = virStorageVolGetName(vols[i]);
+
+        if (VIR_STRDUP(tmp[i], name) < 0)
+            goto cleanup;
+    }
+
+    VIR_STEAL_PTR(ret, tmp);
+
+ cleanup:
+    virStoragePoolFree(pool);
+    for (i = 0; i < nvols; i++)
+        virStorageVolFree(vols[i]);
+    VIR_FREE(vols);
+    return ret;
+}

diff --git a/tools/virsh-completer-volume.h b/tools/virsh-completer-volume.h
new file mode 100644 (file)
index 0000000..6591e13
--- /dev/null
+++ b/tools/virsh-completer-volume.h
@@ -0,0 +1,28 @@
+/*
+ * virsh-completer-volume.h: virsh completer callbacks related to volumes
+ *
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "vsh.h"
+
+
+char ** virshStorageVolNameCompleter(vshControl *ctl,
+                                     const vshCmd *cmd,
+                                     unsigned int flags);

diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
index 3b2268856248163b15bfcad48ad5e71ac799fe06..e6f04296a32847faae44e868629da26fd00acbfb 100644 (file)
--- a/tools/virsh-completer.c
+++ b/tools/virsh-completer.c
@@ -143,53 +143,6 @@ virshCommaStringListComplete(const char *input,
 }
 
 
-char **
-virshStorageVolNameCompleter(vshControl *ctl,
-                             const vshCmd *cmd,
-                             unsigned int flags)
-{
-    virshControlPtr priv = ctl->privData;
-    virStoragePoolPtr pool = NULL;
-    virStorageVolPtr *vols = NULL;
-    int rc;
-    int nvols = 0;
-    size_t i = 0;
-    char **ret = NULL;
-    VIR_AUTOSTRINGLIST tmp = NULL;
-
-    virCheckFlags(0, NULL);
-
-    if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
-        return NULL;
-
-    if (!(pool = virshCommandOptPool(ctl, cmd, "pool", NULL)))
-        return NULL;
-
-    if ((rc = virStoragePoolListAllVolumes(pool, &vols, flags)) < 0)
-        goto cleanup;
-    nvols = rc;
-
-    if (VIR_ALLOC_N(tmp, nvols + 1) < 0)
-        goto cleanup;
-
-    for (i = 0; i < nvols; i++) {
-        const char *name = virStorageVolGetName(vols[i]);
-
-        if (VIR_STRDUP(tmp[i], name) < 0)
-            goto cleanup;
-    }
-
-    VIR_STEAL_PTR(ret, tmp);
-
- cleanup:
-    virStoragePoolFree(pool);
-    for (i = 0; i < nvols; i++)
-        virStorageVolFree(vols[i]);
-    VIR_FREE(vols);
-    return ret;
-}
-
-
 char **
 virshInterfaceNameCompleter(vshControl *ctl,
                             const vshCmd *cmd ATTRIBUTE_UNUSED,

diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h
index dcfc405331490addda1f8aa2446dc6623d9250fb..e03724824a789cfee23d6270a6f683b3d0f84eeb 100644 (file)
--- a/tools/virsh-completer.h
+++ b/tools/virsh-completer.h
@@ -24,14 +24,11 @@
 
 #include "virsh-completer-domain.h"
 #include "virsh-completer-pool.h"
+#include "virsh-completer-volume.h"
 
 char ** virshCommaStringListComplete(const char *input,
                                      const char **options);
 
-char ** virshStorageVolNameCompleter(vshControl *ctl,
-                                     const vshCmd *cmd,
-                                     unsigned int flags);
-
 char ** virshInterfaceNameCompleter(vshControl *ctl,
                                     const vshCmd *cmd,
                                     unsigned int flags);