3:48 a.m.
Mixing all completers in one file does not support
maintainability. Separate those completers which relate to
nwfilter (e.g. they complete various nwfilter aspects)
into virsh-completer-nwfilter.c
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tools/Makefile.am | 1 +
tools/virsh-completer-nwfilter.c | 105 +++++++++++++++++++++++++++++++
tools/virsh-completer-nwfilter.h | 31 +++++++++
tools/virsh-completer.c | 80 -----------------------
tools/virsh-completer.h | 9 +--
5 files changed, 138 insertions(+), 88 deletions(-)
create mode 100644 tools/virsh-completer-nwfilter.c
create mode 100644 tools/virsh-completer-nwfilter.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 22f476a1c2..513154729a 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -221,6 +221,7 @@ virsh_SOURCES = \
virsh-completer-interface.c virsh-completer-interface.h \
virsh-completer-network.c virsh-completer-network.h \
virsh-completer-nodedev.c virsh-completer-nodedev.h \
+ virsh-completer-nwfilter.c virsh-completer-nwfilter.h \
virsh-completer-pool.c virsh-completer-pool.h \
virsh-completer-volume.c virsh-completer-volume.h \
virsh-console.c virsh-console.h \
diff --git a/tools/virsh-completer-nwfilter.c b/tools/virsh-completer-nwfilter.c
new file mode 100644
index 0000000000..0942526f22
--- /dev/null
+++ b/tools/virsh-completer-nwfilter.c
@@ -0,0 +1,105 @@
+/*
+ * virsh-completer-nwfilter.c: virsh completer callbacks related to nwfilters
+ *
+ * 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-nwfilter.h"
+#include "viralloc.h"
+#include "virsh.h"
+#include "virstring.h"
+
+char **
+virshNWFilterNameCompleter(vshControl *ctl,
+ const vshCmd *cmd ATTRIBUTE_UNUSED,
+ unsigned int flags)
+{
+ virshControlPtr priv = ctl->privData;
+ virNWFilterPtr *nwfilters = NULL;
+ int nnwfilters = 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 ((nnwfilters = virConnectListAllNWFilters(priv->conn, &nwfilters, flags))
< 0)
+ return NULL;
+
+ if (VIR_ALLOC_N(tmp, nnwfilters + 1) < 0)
+ goto cleanup;
+
+ for (i = 0; i < nnwfilters; i++) {
+ const char *name = virNWFilterGetName(nwfilters[i]);
+
+ if (VIR_STRDUP(tmp[i], name) < 0)
+ goto cleanup;
+ }
+
+ VIR_STEAL_PTR(ret, tmp);
+
+ cleanup:
+ for (i = 0; i < nnwfilters; i++)
+ virNWFilterFree(nwfilters[i]);
+ VIR_FREE(nwfilters);
+ return ret;
+}
+
+
+char **
+virshNWFilterBindingNameCompleter(vshControl *ctl,
+ const vshCmd *cmd ATTRIBUTE_UNUSED,
+ unsigned int flags)
+{
+ virshControlPtr priv = ctl->privData;
+ virNWFilterBindingPtr *bindings = NULL;
+ int nbindings = 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 ((nbindings = virConnectListAllNWFilterBindings(priv->conn, &bindings,
flags)) < 0)
+ return NULL;
+
+ if (VIR_ALLOC_N(tmp, nbindings + 1) < 0)
+ goto cleanup;
+
+ for (i = 0; i < nbindings; i++) {
+ const char *name = virNWFilterBindingGetPortDev(bindings[i]);
+
+ if (VIR_STRDUP(tmp[i], name) < 0)
+ goto cleanup;
+ }
+
+ VIR_STEAL_PTR(ret, tmp);
+
+ cleanup:
+ for (i = 0; i < nbindings; i++)
+ virNWFilterBindingFree(bindings[i]);
+ VIR_FREE(bindings);
+ return ret;
+}
diff --git a/tools/virsh-completer-nwfilter.h b/tools/virsh-completer-nwfilter.h
new file mode 100644
index 0000000000..86e7df7da4
--- /dev/null
+++ b/tools/virsh-completer-nwfilter.h
@@ -0,0 +1,31 @@
+/*
+ * virsh-completer-nwfilter.h: virsh completer callbacks related to nwfilters
+ *
+ * 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 ** virshNWFilterNameCompleter(vshControl *ctl,
+ const vshCmd *cmd,
+ unsigned int flags);
+
+char ** virshNWFilterBindingNameCompleter(vshControl *ctl,
+ const vshCmd *cmd,
+ unsigned int flags);
diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
index 0b99b3d578..174bd372ce 100644
--- a/tools/virsh-completer.c
+++ b/tools/virsh-completer.c
@@ -143,86 +143,6 @@ virshCommaStringListComplete(const char *input,
}
-char **
-virshNWFilterNameCompleter(vshControl *ctl,
- const vshCmd *cmd ATTRIBUTE_UNUSED,
- unsigned int flags)
-{
- virshControlPtr priv = ctl->privData;
- virNWFilterPtr *nwfilters = NULL;
- int nnwfilters = 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 ((nnwfilters = virConnectListAllNWFilters(priv->conn, &nwfilters, flags))
< 0)
- return NULL;
-
- if (VIR_ALLOC_N(tmp, nnwfilters + 1) < 0)
- goto cleanup;
-
- for (i = 0; i < nnwfilters; i++) {
- const char *name = virNWFilterGetName(nwfilters[i]);
-
- if (VIR_STRDUP(tmp[i], name) < 0)
- goto cleanup;
- }
-
- VIR_STEAL_PTR(ret, tmp);
-
- cleanup:
- for (i = 0; i < nnwfilters; i++)
- virNWFilterFree(nwfilters[i]);
- VIR_FREE(nwfilters);
- return ret;
-}
-
-
-char **
-virshNWFilterBindingNameCompleter(vshControl *ctl,
- const vshCmd *cmd ATTRIBUTE_UNUSED,
- unsigned int flags)
-{
- virshControlPtr priv = ctl->privData;
- virNWFilterBindingPtr *bindings = NULL;
- int nbindings = 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 ((nbindings = virConnectListAllNWFilterBindings(priv->conn, &bindings,
flags)) < 0)
- return NULL;
-
- if (VIR_ALLOC_N(tmp, nbindings + 1) < 0)
- goto cleanup;
-
- for (i = 0; i < nbindings; i++) {
- const char *name = virNWFilterBindingGetPortDev(bindings[i]);
-
- if (VIR_STRDUP(tmp[i], name) < 0)
- goto cleanup;
- }
-
- VIR_STEAL_PTR(ret, tmp);
-
- cleanup:
- for (i = 0; i < nbindings; i++)
- virNWFilterBindingFree(bindings[i]);
- VIR_FREE(bindings);
- return ret;
-}
-
-
char **
virshSecretUUIDCompleter(vshControl *ctl,
const vshCmd *cmd ATTRIBUTE_UNUSED,
diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h
index 39896c13c5..20bf73b4e5 100644
--- a/tools/virsh-completer.h
+++ b/tools/virsh-completer.h
@@ -26,20 +26,13 @@
#include "virsh-completer-interface.h"
#include "virsh-completer-network.h"
#include "virsh-completer-nodedev.h"
+#include "virsh-completer-nwfilter.h"
#include "virsh-completer-pool.h"
#include "virsh-completer-volume.h"
char ** virshCommaStringListComplete(const char *input,
const char **options);
-char ** virshNWFilterNameCompleter(vshControl *ctl,
- const vshCmd *cmd,
- unsigned int flags);
-
-char ** virshNWFilterBindingNameCompleter(vshControl *ctl,
- const vshCmd *cmd,
- unsigned int flags);
-
char ** virshSecretUUIDCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags);
--
2.21.0