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@xxxxxxxxxx> --- tools/Makefile.am | 1 + tools/virsh-completer-volume.c | 73 ++++++++++++++++++++++++++++++++++ tools/virsh-completer-volume.h | 28 +++++++++++++ tools/virsh-completer.c | 47 ---------------------- tools/virsh-completer.h | 5 +-- 5 files changed, 103 insertions(+), 51 deletions(-) create mode 100644 tools/virsh-completer-volume.c create mode 100644 tools/virsh-completer-volume.h diff --git a/tools/Makefile.am b/tools/Makefile.am index 9724e8de53..583ba2f395 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -219,6 +219,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 index 0000000000..2df0077d7a --- /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 index 0000000000..6591e13fdf --- /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 b227b43290..29bccadc80 100644 --- 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 aeb13da622..8da6f485e7 100644 --- 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); -- 2.21.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
