[PATCH 02/14] virsh-completer*.h: Use modern header style

Prevent the need to edit the function declarations to put them into the header. There was even inconsistent use. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tools/virsh-completer-checkpoint.h | 7 +- tools/virsh-completer-domain.h | 155 +++++++++++++++++------------ tools/virsh-completer-host.h | 28 +++--- tools/virsh-completer-interface.h | 14 +-- tools/virsh-completer-network.h | 35 ++++--- tools/virsh-completer-nodedev.h | 21 ++-- tools/virsh-completer-nwfilter.h | 14 +-- tools/virsh-completer-pool.h | 21 ++-- tools/virsh-completer-secret.h | 14 +-- tools/virsh-completer-snapshot.h | 7 +- tools/virsh-completer-volume.h | 14 +-- tools/virsh-completer.h | 5 +- 12 files changed, 192 insertions(+), 143 deletions(-) diff --git a/tools/virsh-completer-checkpoint.h b/tools/virsh-completer-checkpoint.h index c536a3ffda..f76af14817 100644 --- a/tools/virsh-completer-checkpoint.h +++ b/tools/virsh-completer-checkpoint.h @@ -22,6 +22,7 @@ #include "vsh.h" -char ** virshCheckpointNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshCheckpointNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-completer-domain.h b/tools/virsh-completer-domain.h index 39cedf0141..f23ec2735f 100644 --- a/tools/virsh-completer-domain.h +++ b/tools/virsh-completer-domain.h @@ -22,37 +22,44 @@ #include "vsh.h" -char ** virshDomainNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshDomainNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); enum { VIRSH_DOMAIN_INTERFACE_COMPLETER_MAC = 1 << 0, /* Return just MACs */ }; -char ** virshDomainInterfaceCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshDomainInterfaceCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshDomainDiskTargetCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshDomainDiskTargetCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshDomainEventNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshDomainEventNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshDomainInterfaceStateCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshDomainInterfaceStateCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshDomainDeviceAliasCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshDomainDeviceAliasCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshDomainShutdownModeCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshDomainShutdownModeCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); char ** virshDomainInterfaceAddrSourceCompleter(vshControl *ctl, @@ -64,70 +71,86 @@ virshDomainInterfaceSourceModeCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); -char ** virshDomainHostnameSourceCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshDomainHostnameSourceCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshDomainPerfEnableCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshDomainPerfEnableCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshDomainPerfDisableCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshDomainPerfDisableCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshDomainUUIDCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshDomainUUIDCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshDomainIOThreadIdCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshDomainIOThreadIdCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshDomainVcpuCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshDomainVcpuCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + +char ** +virshDomainVcpulistCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + +char ** +virshDomainCpulistCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshDomainVcpulistCompleter(vshControl *ctl, +char ** +virshDomainVcpulistViaAgentCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); -char ** virshDomainCpulistCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshDomainConsoleCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshDomainVcpulistViaAgentCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshDomainSignalCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshDomainConsoleCompleter(vshControl *ctl, +char ** +virshDomainLifecycleCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + +char ** +virshDomainLifecycleActionCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); -char ** virshDomainSignalCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); - -char ** virshDomainLifecycleCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); - -char ** virshDomainLifecycleActionCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshCodesetNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshCodesetNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshKeycodeNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshKeycodeNameCompleter(vshControl *ctl, +char ** +virshDomainFSMountpointsCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); -char ** virshDomainFSMountpointsCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); - char ** virshDomainCoreDumpFormatCompleter(vshControl *ctl, const vshCmd *cmd, diff --git a/tools/virsh-completer-host.h b/tools/virsh-completer-host.h index 88106ec3db..e71ccff536 100644 --- a/tools/virsh-completer-host.h +++ b/tools/virsh-completer-host.h @@ -22,18 +22,22 @@ #include "vsh.h" -char ** virshAllocpagesPagesizeCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshAllocpagesPagesizeCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshCellnoCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshCellnoCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshNodeCpuCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshNodeCpuCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshNodeSuspendTargetCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshNodeSuspendTargetCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-completer-interface.h b/tools/virsh-completer-interface.h index 733f18cb88..3c2ad7d9cb 100644 --- a/tools/virsh-completer-interface.h +++ b/tools/virsh-completer-interface.h @@ -22,10 +22,12 @@ #include "vsh.h" -char ** virshInterfaceNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshInterfaceNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshInterfaceMacCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshInterfaceMacCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-completer-network.h b/tools/virsh-completer-network.h index 80df5c468e..ffcda68355 100644 --- a/tools/virsh-completer-network.h +++ b/tools/virsh-completer-network.h @@ -22,22 +22,27 @@ #include "vsh.h" -char ** virshNetworkNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshNetworkNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshNetworkEventNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshNetworkEventNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshNetworkPortUUIDCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshNetworkPortUUIDCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshNetworkUUIDCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshNetworkUUIDCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshNetworkDhcpMacCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshNetworkDhcpMacCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-completer-nodedev.h b/tools/virsh-completer-nodedev.h index 45c0b73c8c..743f7b2465 100644 --- a/tools/virsh-completer-nodedev.h +++ b/tools/virsh-completer-nodedev.h @@ -22,14 +22,17 @@ #include "vsh.h" -char ** virshNodeDeviceNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshNodeDeviceNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshNodeDeviceEventNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshNodeDeviceEventNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshNodeDeviceCapabilityNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshNodeDeviceCapabilityNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-completer-nwfilter.h b/tools/virsh-completer-nwfilter.h index 86e7df7da4..6a5cda8880 100644 --- a/tools/virsh-completer-nwfilter.h +++ b/tools/virsh-completer-nwfilter.h @@ -22,10 +22,12 @@ #include "vsh.h" -char ** virshNWFilterNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshNWFilterNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshNWFilterBindingNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshNWFilterBindingNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-completer-pool.h b/tools/virsh-completer-pool.h index 510233fb65..059b6ba9e0 100644 --- a/tools/virsh-completer-pool.h +++ b/tools/virsh-completer-pool.h @@ -22,14 +22,17 @@ #include "vsh.h" -char ** virshStoragePoolNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshStoragePoolNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshPoolEventNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshPoolEventNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshPoolTypeCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshPoolTypeCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-completer-secret.h b/tools/virsh-completer-secret.h index 3ed6ba5198..0b1843605c 100644 --- a/tools/virsh-completer-secret.h +++ b/tools/virsh-completer-secret.h @@ -22,10 +22,12 @@ #include "vsh.h" -char ** virshSecretUUIDCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshSecretUUIDCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshSecretEventNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshSecretEventNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-completer-snapshot.h b/tools/virsh-completer-snapshot.h index 1af32e28ca..c7f389685c 100644 --- a/tools/virsh-completer-snapshot.h +++ b/tools/virsh-completer-snapshot.h @@ -22,6 +22,7 @@ #include "vsh.h" -char ** virshSnapshotNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshSnapshotNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-completer-volume.h b/tools/virsh-completer-volume.h index b41d8f4f3e..dc6eeb4b3c 100644 --- a/tools/virsh-completer-volume.h +++ b/tools/virsh-completer-volume.h @@ -23,11 +23,13 @@ #include "vsh.h" -char ** virshStorageVolNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshStorageVolNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); -char ** virshStorageVolKeyCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); +char ** +virshStorageVolKeyCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index 874813335d..1243a13a5e 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -32,5 +32,6 @@ #include "virsh-completer-snapshot.h" #include "virsh-completer-volume.h" -char ** virshCommaStringListComplete(const char *input, - const char **options); +char ** +virshCommaStringListComplete(const char *input, + const char **options); -- 2.31.1