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@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tools/virsh-completer-checkpoint.h b/tools/virsh-completer-checkpoint.h
index c536a3ffdad6d0c8f004145e3aa816a9506b1456..f76af14817362b829208b7cb5200c804bd702a32 100644 (file)
--- 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 39cedf014192dd2a43af5867d3648f485f9ad218..f23ec2735f6106f99632c3b11c7af978cbb32097 100644 (file)
--- 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 88106ec3dbe9e14f1afab8c2fa0d82470b73d438..e71ccff5363c3612ef160fcd961a3dc609dd5103 100644 (file)
--- 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 733f18cb88c226feb49da6ba638234ec354aa97d..3c2ad7d9cb134ec4b2dea6f0398cfcbe1bdebeee 100644 (file)
--- 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 80df5c468ea370495f9ae8938086ebb82a729dd4..ffcda683550b7d81b8cf1792b6d530785cd3dfe0 100644 (file)
--- 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 45c0b73c8c57b6776771d7de56c07d9f12b2f8c4..743f7b246558950bd920cd9ee28e00b66835feea 100644 (file)
--- 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 86e7df7da40c918406ba40347e47e36f90043f98..6a5cda8880f3641113e59af5a7b6360fbb3a3f98 100644 (file)
--- 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 510233fb65e9581cd2e17af8f4d9e167a48af0be..059b6ba9e0e8712a189e77cd24c306ee68c02ec7 100644 (file)
--- 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 3ed6ba51986f8d1213977db56561327c69d49d42..0b1843605ca4603b1537ef416f199886ff4f5335 100644 (file)
--- 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 1af32e28ca5e4bc82baa220f8fcea9e91c76cc94..c7f389685c43baf747de0d97068138412f634e22 100644 (file)
--- 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 b41d8f4f3eb503fb0837eb16e787e030c8da84a6..dc6eeb4b3c31132f1453dd8649d8a5ffebce0eb8 100644 (file)
--- 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 874813335de6f5965473e6e172bf4f28a5b5cd83..1243a13a5e9557df5e84da7072f7bc260445c58e 100644 (file)
--- 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);