3:48 a.m.
Mixing all completers in one file does not support
maintainability. Separate those completers which relate to
secret (e.g. they complete various secret aspects)
into virsh-completer-secret.c
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tools/Makefile.am | 1 +
tools/virsh-completer-secret.c | 91 ++++++++++++++++++++++++++++++++++
tools/virsh-completer-secret.h | 31 ++++++++++++
tools/virsh-completer.c | 65 ------------------------
tools/virsh-completer.h | 9 +---
5 files changed, 124 insertions(+), 73 deletions(-)
create mode 100644 tools/virsh-completer-secret.c
create mode 100644 tools/virsh-completer-secret.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 513154729a..c24cab80fd 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -223,6 +223,7 @@ virsh_SOURCES = \
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-secret.c virsh-completer-secret.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-secret.c b/tools/virsh-completer-secret.c
new file mode 100644
index 0000000000..a6924b6b8c
--- /dev/null
+++ b/tools/virsh-completer-secret.c
@@ -0,0 +1,91 @@
+/*
+ * virsh-completer-secret.c: virsh completer callbacks related to secret
+ *
+ * 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-secret.h"
+#include "viralloc.h"
+#include "virsh-secret.h"
+#include "virsh.h"
+#include "virstring.h"
+
+char **
+virshSecretUUIDCompleter(vshControl *ctl,
+ const vshCmd *cmd ATTRIBUTE_UNUSED,
+ unsigned int flags)
+{
+ virshControlPtr priv = ctl->privData;
+ virSecretPtr *secrets = NULL;
+ int nsecrets = 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 ((nsecrets = virConnectListAllSecrets(priv->conn, &secrets, flags)) <
0)
+ return NULL;
+
+ if (VIR_ALLOC_N(tmp, nsecrets + 1) < 0)
+ goto cleanup;
+
+ for (i = 0; i < nsecrets; i++) {
+ char uuid[VIR_UUID_STRING_BUFLEN];
+
+ if (virSecretGetUUIDString(secrets[i], uuid) < 0 ||
+ VIR_STRDUP(tmp[i], uuid) < 0)
+ goto cleanup;
+ }
+
+ VIR_STEAL_PTR(ret, tmp);
+
+ cleanup:
+ for (i = 0; i < nsecrets; i++)
+ virSecretFree(secrets[i]);
+ VIR_FREE(secrets);
+ return ret;
+}
+
+
+char **
+virshSecretEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED,
+ const vshCmd *cmd ATTRIBUTE_UNUSED,
+ unsigned int flags)
+{
+ size_t i;
+ char **ret = NULL;
+ VIR_AUTOSTRINGLIST tmp = NULL;
+
+ virCheckFlags(0, NULL);
+
+ if (VIR_ALLOC_N(tmp, VIR_SECRET_EVENT_ID_LAST + 1) < 0)
+ return NULL;
+
+ for (i = 0; i < VIR_SECRET_EVENT_ID_LAST; i++) {
+ if (VIR_STRDUP(tmp[i], virshSecretEventCallbacks[i].name) < 0)
+ return NULL;
+ }
+
+ VIR_STEAL_PTR(ret, tmp);
+ return ret;
+}
diff --git a/tools/virsh-completer-secret.h b/tools/virsh-completer-secret.h
new file mode 100644
index 0000000000..3ed6ba5198
--- /dev/null
+++ b/tools/virsh-completer-secret.h
@@ -0,0 +1,31 @@
+/*
+ * virsh-completer-secret.h: virsh completer callbacks related to secret
+ *
+ * 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 ** virshSecretUUIDCompleter(vshControl *ctl,
+ const vshCmd *cmd,
+ unsigned int flags);
+
+char ** virshSecretEventNameCompleter(vshControl *ctl,
+ const vshCmd *cmd,
+ unsigned int flags);
diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
index 174bd372ce..04ca2c919c 100644
--- a/tools/virsh-completer.c
+++ b/tools/virsh-completer.c
@@ -143,47 +143,6 @@ virshCommaStringListComplete(const char *input,
}
-char **
-virshSecretUUIDCompleter(vshControl *ctl,
- const vshCmd *cmd ATTRIBUTE_UNUSED,
- unsigned int flags)
-{
- virshControlPtr priv = ctl->privData;
- virSecretPtr *secrets = NULL;
- int nsecrets = 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 ((nsecrets = virConnectListAllSecrets(priv->conn, &secrets, flags)) <
0)
- return NULL;
-
- if (VIR_ALLOC_N(tmp, nsecrets + 1) < 0)
- goto cleanup;
-
- for (i = 0; i < nsecrets; i++) {
- char uuid[VIR_UUID_STRING_BUFLEN];
-
- if (virSecretGetUUIDString(secrets[i], uuid) < 0 ||
- VIR_STRDUP(tmp[i], uuid) < 0)
- goto cleanup;
- }
-
- VIR_STEAL_PTR(ret, tmp);
-
- cleanup:
- for (i = 0; i < nsecrets; i++)
- virSecretFree(secrets[i]);
- VIR_FREE(secrets);
- return ret;
-}
-
-
char **
virshSnapshotNameCompleter(vshControl *ctl,
const vshCmd *cmd,
@@ -308,30 +267,6 @@ virshAllocpagesPagesizeCompleter(vshControl *ctl,
}
-char **
-virshSecretEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED,
- const vshCmd *cmd ATTRIBUTE_UNUSED,
- unsigned int flags)
-{
- size_t i;
- char **ret = NULL;
- VIR_AUTOSTRINGLIST tmp = NULL;
-
- virCheckFlags(0, NULL);
-
- if (VIR_ALLOC_N(tmp, VIR_SECRET_EVENT_ID_LAST + 1) < 0)
- return NULL;
-
- for (i = 0; i < VIR_SECRET_EVENT_ID_LAST; i++) {
- if (VIR_STRDUP(tmp[i], virshSecretEventCallbacks[i].name) < 0)
- return NULL;
- }
-
- VIR_STEAL_PTR(ret, tmp);
- return ret;
-}
-
-
char **
virshCellnoCompleter(vshControl *ctl,
const vshCmd *cmd ATTRIBUTE_UNUSED,
diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h
index 20bf73b4e5..2dc9e95f1c 100644
--- a/tools/virsh-completer.h
+++ b/tools/virsh-completer.h
@@ -28,15 +28,12 @@
#include "virsh-completer-nodedev.h"
#include "virsh-completer-nwfilter.h"
#include "virsh-completer-pool.h"
+#include "virsh-completer-secret.h"
#include "virsh-completer-volume.h"
char ** virshCommaStringListComplete(const char *input,
const char **options);
-char ** virshSecretUUIDCompleter(vshControl *ctl,
- const vshCmd *cmd,
- unsigned int flags);
-
char ** virshSnapshotNameCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags);
@@ -45,10 +42,6 @@ char ** virshAllocpagesPagesizeCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags);
-char ** virshSecretEventNameCompleter(vshControl *ctl,
- const vshCmd *cmd,
- unsigned int flags);
-
char ** virshCellnoCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags);
--
2.21.0