tools: Separate storage pool related completers into a file

Mixing all completers in one file does not support
maintainability. Separate those completers which relate to
storage pools (e.g. they complete various storage pool aspects)
into virsh-completer-pool.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 a5d4df4d09fb77e84c2b6bc42cb3e33a9682b7cd..38606f7a95f8b28f4ab38df970d8e344933d8acb 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -228,6 +228,7 @@ virsh_SOURCES = \
                virsh-checkpoint.c virsh-checkpoint.h \
                virsh-completer.c virsh-completer.h \
                virsh-completer-domain.c virsh-completer-domain.h \
+               virsh-completer-pool.c virsh-completer-pool.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-pool.c b/tools/virsh-completer-pool.c
new file mode 100644 (file)
index 0000000..fc01550
--- /dev/null
+++ b/tools/virsh-completer-pool.c
@@ -0,0 +1,93 @@
+/*
+ * virsh-completer-pool.c: virsh completer callbacks related to pools
+ *
+ * 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-pool.h"
+#include "viralloc.h"
+#include "virsh-pool.h"
+#include "virsh.h"
+#include "virstring.h"
+
+char **
+virshStoragePoolNameCompleter(vshControl *ctl,
+                              const vshCmd *cmd ATTRIBUTE_UNUSED,
+                              unsigned int flags)
+{
+    virshControlPtr priv = ctl->privData;
+    virStoragePoolPtr *pools = NULL;
+    int npools = 0;
+    size_t i = 0;
+    char **ret = NULL;
+    VIR_AUTOSTRINGLIST tmp = NULL;
+
+    virCheckFlags(VIR_CONNECT_LIST_STORAGE_POOLS_INACTIVE |
+                  VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE |
+                  VIR_CONNECT_LIST_STORAGE_POOLS_PERSISTENT,
+                  NULL);
+
+    if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
+        return NULL;
+
+    if ((npools = virConnectListAllStoragePools(priv->conn, &pools, flags)) < 0)
+        return NULL;
+
+    if (VIR_ALLOC_N(tmp, npools + 1) < 0)
+        goto cleanup;
+
+    for (i = 0; i < npools; i++) {
+        const char *name = virStoragePoolGetName(pools[i]);
+
+        if (VIR_STRDUP(tmp[i], name) < 0)
+            goto cleanup;
+    }
+
+    VIR_STEAL_PTR(ret, tmp);
+
+ cleanup:
+    for (i = 0; i < npools; i++)
+        virStoragePoolFree(pools[i]);
+    VIR_FREE(pools);
+    return ret;
+}
+
+
+char **
+virshPoolEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED,
+                            const vshCmd *cmd ATTRIBUTE_UNUSED,
+                            unsigned int flags)
+{
+    size_t i = 0;
+    char **ret = NULL;
+    VIR_AUTOSTRINGLIST tmp = NULL;
+
+    virCheckFlags(0, NULL);
+
+    if (VIR_ALLOC_N(tmp, VIR_STORAGE_POOL_EVENT_ID_LAST + 1) < 0)
+        return NULL;
+
+    for (i = 0; i < VIR_STORAGE_POOL_EVENT_ID_LAST; i++) {
+        if (VIR_STRDUP(tmp[i], virshPoolEventCallbacks[i].name) < 0)
+            return NULL;
+    }
+
+    VIR_STEAL_PTR(ret, tmp);
+    return ret;
+}

diff --git a/tools/virsh-completer-pool.h b/tools/virsh-completer-pool.h
new file mode 100644 (file)
index 0000000..778ab25
--- /dev/null
+++ b/tools/virsh-completer-pool.h
@@ -0,0 +1,31 @@
+/*
+ * virsh-completer-pool.h: virsh completer callbacks related to pools
+ *
+ * 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 ** virshStoragePoolNameCompleter(vshControl *ctl,
+                                      const vshCmd *cmd,
+                                      unsigned int flags);
+
+char ** virshPoolEventNameCompleter(vshControl *ctl,
+                                    const vshCmd *cmd,
+                                    unsigned int flags);

diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
index 787bac08f65b6bb0d78f007ea4328b65eab7dfc0..3b2268856248163b15bfcad48ad5e71ac799fe06 100644 (file)
--- a/tools/virsh-completer.c
+++ b/tools/virsh-completer.c
@@ -143,49 +143,6 @@ virshCommaStringListComplete(const char *input,
 }
 
 
-char **
-virshStoragePoolNameCompleter(vshControl *ctl,
-                              const vshCmd *cmd ATTRIBUTE_UNUSED,
-                              unsigned int flags)
-{
-    virshControlPtr priv = ctl->privData;
-    virStoragePoolPtr *pools = NULL;
-    int npools = 0;
-    size_t i = 0;
-    char **ret = NULL;
-    VIR_AUTOSTRINGLIST tmp = NULL;
-
-    virCheckFlags(VIR_CONNECT_LIST_STORAGE_POOLS_INACTIVE |
-                  VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE |
-                  VIR_CONNECT_LIST_STORAGE_POOLS_PERSISTENT,
-                  NULL);
-
-    if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
-        return NULL;
-
-    if ((npools = virConnectListAllStoragePools(priv->conn, &pools, flags)) < 0)
-        return NULL;
-
-    if (VIR_ALLOC_N(tmp, npools + 1) < 0)
-        goto cleanup;
-
-    for (i = 0; i < npools; i++) {
-        const char *name = virStoragePoolGetName(pools[i]);
-
-        if (VIR_STRDUP(tmp[i], name) < 0)
-            goto cleanup;
-    }
-
-    VIR_STEAL_PTR(ret, tmp);
-
- cleanup:
-    for (i = 0; i < npools; i++)
-        virStoragePoolFree(pools[i]);
-    VIR_FREE(pools);
-    return ret;
-}
-
-
 char **
 virshStorageVolNameCompleter(vshControl *ctl,
                              const vshCmd *cmd,
@@ -754,30 +711,6 @@ virshSecretEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED,
 }
 
 
-char **
-virshPoolEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED,
-                            const vshCmd *cmd ATTRIBUTE_UNUSED,
-                            unsigned int flags)
-{
-    size_t i = 0;
-    char **ret = NULL;
-    VIR_AUTOSTRINGLIST tmp = NULL;
-
-    virCheckFlags(0, NULL);
-
-    if (VIR_ALLOC_N(tmp, VIR_STORAGE_POOL_EVENT_ID_LAST + 1) < 0)
-        return NULL;
-
-    for (i = 0; i < VIR_STORAGE_POOL_EVENT_ID_LAST; i++) {
-        if (VIR_STRDUP(tmp[i], virshPoolEventCallbacks[i].name) < 0)
-            return NULL;
-    }
-
-    VIR_STEAL_PTR(ret, tmp);
-    return ret;
-}
-
-
 char **
 virshNodeDeviceEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED,
                                   const vshCmd *cmd ATTRIBUTE_UNUSED,

diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h
index 5a58bd797e95b9abd9c5c60b481ca868c0e00cc2..dcfc405331490addda1f8aa2446dc6623d9250fb 100644 (file)
--- a/tools/virsh-completer.h
+++ b/tools/virsh-completer.h
@@ -23,14 +23,11 @@
 #include "vsh.h"
 
 #include "virsh-completer-domain.h"
+#include "virsh-completer-pool.h"
 
 char ** virshCommaStringListComplete(const char *input,
                                      const char **options);
 
-char ** virshStoragePoolNameCompleter(vshControl *ctl,
-                                      const vshCmd *cmd,
-                                      unsigned int flags);
-
 char ** virshStorageVolNameCompleter(vshControl *ctl,
                                      const vshCmd *cmd,
                                      unsigned int flags);
@@ -83,10 +80,6 @@ char ** virshSecretEventNameCompleter(vshControl *ctl,
                                       const vshCmd *cmd,
                                       unsigned int flags);
 
-char ** virshPoolEventNameCompleter(vshControl *ctl,
-                                    const vshCmd *cmd,
-                                    unsigned int flags);
-
 char ** virshNodeDeviceEventNameCompleter(vshControl *ctl,
                                           const vshCmd *cmd,
                                           unsigned int flags);