tools: Separate snapshot related completers into a file

Mixing all completers in one file does not support
maintainability. Separate those completers which relate to
snapshot (e.g. they complete various snapshot aspects)
into virsh-completer-snapshot.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 34ce40ef21cad679532286adc5c1808b279d54a6..03abd1deac17d6515d8b8dc6898441416f45a9af 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -234,6 +234,7 @@ virsh_SOURCES = \
                virsh-completer-nwfilter.c virsh-completer-nwfilter.h \
                virsh-completer-pool.c virsh-completer-pool.h \
                virsh-completer-secret.c virsh-completer-secret.h \
+               virsh-completer-snapshot.c virsh-completer-snapshot.h \
                virsh-completer-volume.c virsh-completer-volume.h \
                virsh-console.c virsh-console.h \
                virsh-domain.c virsh-domain.h \

diff --git a/tools/virsh-completer-snapshot.c b/tools/virsh-completer-snapshot.c
new file mode 100644 (file)
index 0000000..cad56e2
--- /dev/null
+++ b/tools/virsh-completer-snapshot.c
@@ -0,0 +1,73 @@
+/*
+ * virsh-completer-snapshot.c: virsh completer callbacks related to snapshots
+ *
+ * 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-snapshot.h"
+#include "viralloc.h"
+#include "virsh-util.h"
+#include "virsh.h"
+#include "virstring.h"
+
+char **
+virshSnapshotNameCompleter(vshControl *ctl,
+                           const vshCmd *cmd,
+                           unsigned int flags)
+{
+    virshControlPtr priv = ctl->privData;
+    virDomainPtr dom = NULL;
+    virDomainSnapshotPtr *snapshots = NULL;
+    int rc;
+    int nsnapshots = 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 (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
+        return NULL;
+
+    if ((rc = virDomainListAllSnapshots(dom, &snapshots, flags)) < 0)
+        goto cleanup;
+    nsnapshots = rc;
+
+    if (VIR_ALLOC_N(tmp, nsnapshots + 1) < 0)
+        goto cleanup;
+
+    for (i = 0; i < nsnapshots; i++) {
+        const char *name = virDomainSnapshotGetName(snapshots[i]);
+
+        if (VIR_STRDUP(tmp[i], name) < 0)
+            goto cleanup;
+    }
+
+    VIR_STEAL_PTR(ret, tmp);
+
+ cleanup:
+    virshDomainFree(dom);
+    for (i = 0; i < nsnapshots; i++)
+        virshDomainSnapshotFree(snapshots[i]);
+    VIR_FREE(snapshots);
+    return ret;
+}

diff --git a/tools/virsh-completer-snapshot.h b/tools/virsh-completer-snapshot.h
new file mode 100644 (file)
index 0000000..1af32e2
--- /dev/null
+++ b/tools/virsh-completer-snapshot.h
@@ -0,0 +1,27 @@
+/*
+ * virsh-completer-snapshot.h: virsh completer callbacks related to snapshots
+ *
+ * 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 ** virshSnapshotNameCompleter(vshControl *ctl,
+                                   const vshCmd *cmd,
+                                   unsigned int flags);

diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
index 3489f8741aa1092f15e653544c250f1a527b56b8..72223803dda9ad8c5596d886feac8d09ff597b3a 100644 (file)
--- a/tools/virsh-completer.c
+++ b/tools/virsh-completer.c
@@ -194,51 +194,6 @@ virshCheckpointNameCompleter(vshControl *ctl,
     return NULL;
 }
 
-char **
-virshSnapshotNameCompleter(vshControl *ctl,
-                           const vshCmd *cmd,
-                           unsigned int flags)
-{
-    virshControlPtr priv = ctl->privData;
-    virDomainPtr dom = NULL;
-    virDomainSnapshotPtr *snapshots = NULL;
-    int rc;
-    int nsnapshots = 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 (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
-        return NULL;
-
-    if ((rc = virDomainListAllSnapshots(dom, &snapshots, flags)) < 0)
-        goto cleanup;
-    nsnapshots = rc;
-
-    if (VIR_ALLOC_N(tmp, nsnapshots + 1) < 0)
-        goto cleanup;
-
-    for (i = 0; i < nsnapshots; i++) {
-        const char *name = virDomainSnapshotGetName(snapshots[i]);
-
-        if (VIR_STRDUP(tmp[i], name) < 0)
-            goto cleanup;
-    }
-
-    VIR_STEAL_PTR(ret, tmp);
-
- cleanup:
-    virshDomainFree(dom);
-    for (i = 0; i < nsnapshots; i++)
-        virshDomainSnapshotFree(snapshots[i]);
-    VIR_FREE(snapshots);
-    return ret;
-}
 
 static char *
 virshPagesizeNodeToString(xmlNodePtr node)

diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h
index e27d58e536347602e5768b447fa71233d89f95b1..4ebd61f3bedf6bfac78ee6cbbaca7c9d8a8c6a37 100644 (file)
--- a/tools/virsh-completer.h
+++ b/tools/virsh-completer.h
@@ -29,6 +29,7 @@
 #include "virsh-completer-nwfilter.h"
 #include "virsh-completer-pool.h"
 #include "virsh-completer-secret.h"
+#include "virsh-completer-snapshot.h"
 #include "virsh-completer-volume.h"
 
 char ** virshCommaStringListComplete(const char *input,
@@ -38,10 +39,6 @@ char ** virshCheckpointNameCompleter(vshControl *ctl,
                                      const vshCmd *cmd,
                                      unsigned int flags);
 
-char ** virshSnapshotNameCompleter(vshControl *ctl,
-                                   const vshCmd *cmd,
-                                   unsigned int flags);
-
 char ** virshAllocpagesPagesizeCompleter(vshControl *ctl,
                                          const vshCmd *cmd,
                                          unsigned int flags);