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@xxxxxxxxxx> --- tools/Makefile.am | 1 + tools/virsh-completer-pool.c | 93 ++++++++++++++++++++++++++++++++++++ tools/virsh-completer-pool.h | 31 ++++++++++++ tools/virsh-completer.c | 67 -------------------------- tools/virsh-completer.h | 9 +--- 5 files changed, 126 insertions(+), 75 deletions(-) create mode 100644 tools/virsh-completer-pool.c create mode 100644 tools/virsh-completer-pool.h diff --git a/tools/Makefile.am b/tools/Makefile.am index 8dbfba700a..9724e8de53 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -218,6 +218,7 @@ virsh_SOURCES = \ virsh.c virsh.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 index 0000000000..fc01550908 --- /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 index 0000000000..778ab25df2 --- /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 71796182b0..b227b43290 100644 --- 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, @@ -703,30 +660,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 0c6d993f8f..aeb13da622 100644 --- 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); @@ -79,10 +76,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); -- 2.21.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
