Mixing all completers in one file does not support maintainability. Separate those completers which relate to host (e.g. they complete various checkpoint aspects) into virsh-completer-checkpoint.c Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> --- tools/Makefile.am | 1 + tools/virsh-completer-checkpoint.c | 78 ++++++++++++++++++++++++++++++ tools/virsh-completer-checkpoint.h | 27 +++++++++++ tools/virsh-completer.c | 52 -------------------- 4 files changed, 106 insertions(+), 52 deletions(-) create mode 100644 tools/virsh-completer-checkpoint.c create mode 100644 tools/virsh-completer-checkpoint.h diff --git a/tools/Makefile.am b/tools/Makefile.am index 43083f4afa..274f941d74 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -219,6 +219,7 @@ virsh_SOURCES = \ virsh-checkpoint.c virsh-checkpoint.h \ virsh-completer.c virsh-completer.h \ virsh-completer-domain.c virsh-completer-domain.h \ + virsh-completer-checkpoint.c virsh-completer-checkpoint.h \ virsh-completer-host.c virsh-completer-host.h \ virsh-completer-interface.c virsh-completer-interface.h \ virsh-completer-network.c virsh-completer-network.h \ diff --git a/tools/virsh-completer-checkpoint.c b/tools/virsh-completer-checkpoint.c new file mode 100644 index 0000000000..ce9d32844d --- /dev/null +++ b/tools/virsh-completer-checkpoint.c @@ -0,0 +1,78 @@ +/* + * virsh-completer-checkpoint.c: virsh completer callbacks related to checkpoints + * + * 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-checkpoint.h" +#include "viralloc.h" +#include "virsh-util.h" +#include "virsh.h" +#include "virstring.h" + +char ** +virshCheckpointNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags) +{ + virshControlPtr priv = ctl->privData; + virDomainPtr dom = NULL; + virDomainCheckpointPtr *checkpoints = NULL; + int ncheckpoints = 0; + size_t i = 0; + char **ret = NULL; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) + return NULL; + + if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) + return NULL; + + if ((ncheckpoints = virDomainListAllCheckpoints(dom, &checkpoints, + flags)) < 0) + goto error; + + if (VIR_ALLOC_N(ret, ncheckpoints + 1) < 0) + goto error; + + for (i = 0; i < ncheckpoints; i++) { + const char *name = virDomainCheckpointGetName(checkpoints[i]); + + if (VIR_STRDUP(ret[i], name) < 0) + goto error; + + virshDomainCheckpointFree(checkpoints[i]); + } + VIR_FREE(checkpoints); + virshDomainFree(dom); + + return ret; + + error: + for (; i < ncheckpoints; i++) + virshDomainCheckpointFree(checkpoints[i]); + VIR_FREE(checkpoints); + for (i = 0; i < ncheckpoints; i++) + VIR_FREE(ret[i]); + VIR_FREE(ret); + virshDomainFree(dom); + return NULL; +} diff --git a/tools/virsh-completer-checkpoint.h b/tools/virsh-completer-checkpoint.h new file mode 100644 index 0000000000..c536a3ffda --- /dev/null +++ b/tools/virsh-completer-checkpoint.h @@ -0,0 +1,27 @@ +/* + * virsh-completer-checkpoint.h: virsh completer callbacks related to checkpoints + * + * 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 ** virshCheckpointNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index ce42f62fc1..0f1709b4ba 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -141,55 +141,3 @@ virshCommaStringListComplete(const char *input, VIR_RETURN_PTR(ret); } - - -char ** -virshCheckpointNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags) -{ - virshControlPtr priv = ctl->privData; - virDomainPtr dom = NULL; - virDomainCheckpointPtr *checkpoints = NULL; - int ncheckpoints = 0; - size_t i = 0; - char **ret = NULL; - - virCheckFlags(0, NULL); - - if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) - return NULL; - - if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) - return NULL; - - if ((ncheckpoints = virDomainListAllCheckpoints(dom, &checkpoints, - flags)) < 0) - goto error; - - if (VIR_ALLOC_N(ret, ncheckpoints + 1) < 0) - goto error; - - for (i = 0; i < ncheckpoints; i++) { - const char *name = virDomainCheckpointGetName(checkpoints[i]); - - if (VIR_STRDUP(ret[i], name) < 0) - goto error; - - virshDomainCheckpointFree(checkpoints[i]); - } - VIR_FREE(checkpoints); - virshDomainFree(dom); - - return ret; - - error: - for (; i < ncheckpoints; i++) - virshDomainCheckpointFree(checkpoints[i]); - VIR_FREE(checkpoints); - for (i = 0; i < ncheckpoints; i++) - VIR_FREE(ret[i]); - VIR_FREE(ret); - virshDomainFree(dom); - return NULL; -} -- 2.21.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
