lib: Put some variable declarations on individual lines

In short, virXXXPtr type is going away. With big bang. And to
help us rewrite the code with a sed script, it's better if each
variable is declared on its own line.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index c4c64788b9213d1b1a8b27ec6565c7b3bb1513d5..e3c2921dea7bb0c201286438f9d248ee13fe086a 100644 (file)
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -917,7 +917,10 @@ virBhyveProcessBuildGrubbhyveCmd(virDomainDefPtr def,
                                  const char *devmap_file,
                                  char **devicesmap_out)
 {
-    virDomainDiskDefPtr hdd, cd, userdef, diskdef;
+    virDomainDiskDefPtr hdd;
+    virDomainDiskDefPtr cd;
+    virDomainDiskDefPtr userdef;
+    virDomainDiskDefPtr diskdef;
     virCommandPtr cmd;
     unsigned int best_idx = UINT_MAX;
     size_t i;

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index 8363259d4c7c19305c590c7e6a536bc6794aafe3..158fee4445b47939e1e0b8a3e179371cc6b5ac2e 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -681,7 +681,8 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn,
     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     bhyveConnPtr privconn = conn->privateData;
     virDomainDefPtr def = NULL;
-    virCommandPtr cmd = NULL, loadcmd = NULL;
+    virCommandPtr cmd = NULL;
+    virCommandPtr loadcmd = NULL;
     char *ret = NULL;
 
     virCheckFlags(0, NULL);

diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index fa08f5381dfc15edecbbac4421fdd22a0b549c96..8b927689f849d9e9358098458f190667a93aa078 100644 (file)
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -2082,7 +2082,8 @@ int
 virDomainUSBAddressSetAddHub(virDomainUSBAddressSetPtr addrs,
                              virDomainHubDefPtr hub)
 {
-    virDomainUSBAddressHubPtr targetHub = NULL, newHub = NULL;
+    virDomainUSBAddressHubPtr targetHub = NULL;
+    virDomainUSBAddressHubPtr newHub = NULL;
     int ret = -1;
     int targetPort;
     g_autofree char *portStr = NULL;

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 08e09362eeb0333a67b4a726706902c6a9b7a1a2..47756ff0be2f92a4dccf622df64baa0022c276e2 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -17621,7 +17621,8 @@ virDomainChrDefPtr
 virDomainChrRemove(virDomainDefPtr vmdef,
                    virDomainChrDefPtr chr)
 {
-    virDomainChrDefPtr ret = NULL, **arrPtr = NULL;
+    virDomainChrDefPtr ret = NULL;
+    virDomainChrDefPtr **arrPtr = NULL;
     size_t i, *cntPtr = NULL;
 
     if (virDomainChrGetDomainPtrsInternal(vmdef, chr->deviceType,

diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c
index 338d779e9070cc6bc4950078398de06f04e19cb7..64b93fd7d1ca77d7f664640c7fd0faefac773b32 100644 (file)
--- a/src/conf/numa_conf.c
+++ b/src/conf/numa_conf.c
@@ -780,7 +780,8 @@ virDomainNumaDefNodeDistanceParseXML(virDomainNumaPtr def,
     }
 
     for (i = 0; i < sibling; i++) {
-        virDomainNumaDistancePtr ldist, rdist;
+        virDomainNumaDistancePtr ldist;
+        virDomainNumaDistancePtr rdist;
         unsigned int sibling_id, sibling_value;
 
         /* siblings are in order of parsing or explicitly numbered */

diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index 1be492759a0083591baf8a239e66a7281d6a70c0..5fa5d4fedbb3564564907c529014ffb901f11745 100644 (file)
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -402,7 +402,8 @@ virNWFilterVarCombIterEntryAreUniqueEntries(virNWFilterVarCombIterEntryPtr cie,
                                             GHashTable *hash)
 {
     size_t i, j;
-    virNWFilterVarValuePtr varValue, tmp;
+    virNWFilterVarValuePtr varValue;
+    virNWFilterVarValuePtr tmp;
     const char *value;
 
     varValue = virHashLookup(hash, cie->varNames[0]);

diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index 1e167c78741f534f9d7bd7812b352b37f6879684..6ff6c632189be029e21b8bd00883b67514949af4 100644 (file)
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -1254,7 +1254,8 @@ virNetworkObjUpdate(virNetworkObjPtr obj,
                     unsigned int flags)  /* virNetworkUpdateFlags */
 {
     int ret = -1;
-    virNetworkDefPtr livedef = NULL, configdef = NULL;
+    virNetworkDefPtr livedef = NULL;
+    virNetworkDefPtr configdef = NULL;
 
     /* normalize config data, and check for common invalid requests. */
     if (virNetworkObjConfigChangeSetup(obj, xmlopt, flags) < 0)

diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c
index c08b7d46c5a863e010af7c28e80b4444e201b4ae..ef5803ec2adc82223bf7bd7de3cc907d62c54e7d 100644 (file)
--- a/src/hypervisor/domain_driver.c
+++ b/src/hypervisor/domain_driver.c
@@ -128,7 +128,8 @@ virDomainDriverMergeBlkioDevice(virBlkioDevicePtr *dest_array,
                                 const char *type)
 {
     size_t i, j;
-    virBlkioDevicePtr dest, src;
+    virBlkioDevicePtr dest;
+    virBlkioDevicePtr src;
 
     for (i = 0; i < src_size; i++) {
         bool found = false;

diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c
index 01c56f51bc69eaf6657635b4cab8c0f9bd6f521e..a3ec63138e8c9bd005103bc4d3652e4f42b69cc4 100644 (file)
--- a/src/hypervisor/virhostdev.c
+++ b/src/hypervisor/virhostdev.c
@@ -832,7 +832,8 @@ virHostdevPreparePCIDevicesImpl(virHostdevManagerPtr mgr,
 
     /* Step 6: Set driver and domain information */
     for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
-        virPCIDevicePtr pci, actual;
+        virPCIDevicePtr pci;
+        virPCIDevicePtr actual;
 
         /* We need to look up the actual device and set the information
          * there because 'pci' only contain address information and will

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index c93dbeeabfe1ee8faf3fe9f36800af86e8abf682..e3d769b5d9b1fca25e49b5a40e87c1274b0493eb 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3961,9 +3961,12 @@ libxlDomainDetachDeviceLive(libxlDriverPrivatePtr driver,
 static int
 libxlDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev)
 {
-    virDomainDiskDefPtr disk, detach;
-    virDomainHostdevDefPtr hostdev, det_hostdev;
-    virDomainControllerDefPtr cont, det_cont;
+    virDomainDiskDefPtr disk;
+    virDomainDiskDefPtr detach;
+    virDomainHostdevDefPtr hostdev;
+    virDomainHostdevDefPtr det_hostdev;
+    virDomainControllerDefPtr cont;
+    virDomainControllerDefPtr det_cont;
     virDomainNetDefPtr net;
     int idx;
 

diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c
index 0d3a3f994a7d492af5a82fc62bf06f194514937b..ac71b2d0841514daf6ad5c50ea3fff267da8c828 100644 (file)
--- a/src/libxl/xen_common.c
+++ b/src/libxl/xen_common.c
@@ -1559,7 +1559,8 @@ static int
 xenFormatSerial(virConfValuePtr list, virDomainChrDefPtr serial)
 {
     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-    virConfValuePtr val, tmp;
+    virConfValuePtr val;
+    virConfValuePtr tmp;
     int ret;
 
     if (serial) {
@@ -1614,7 +1615,8 @@ xenFormatNet(virConnectPtr conn,
              const char *vif_typename)
 {
     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-    virConfValuePtr val, tmp;
+    virConfValuePtr val;
+    virConfValuePtr tmp;
     char macaddr[VIR_MAC_STRING_BUFLEN];
 
     virBufferAsprintf(&buf, "mac=%s", virMacAddrFormat(&net->mac, macaddr));
@@ -1768,7 +1770,8 @@ xenFormatPCI(virConfPtr conf, virDomainDefPtr def)
     for (i = 0; i < def->nhostdevs; i++) {
         if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
             def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
-            virConfValuePtr val, tmp;
+            virConfValuePtr val;
+            virConfValuePtr tmp;
             char *buf;
             const char *permissive_str = NULL;
 
@@ -2242,7 +2245,8 @@ xenFormatVfb(virConfPtr conf, virDomainDefPtr def)
                     return -1;
             }
         } else {
-            virConfValuePtr vfb, disp;
+            virConfValuePtr vfb;
+            virConfValuePtr disp;
             char *vfbstr = NULL;
             g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
 

diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
index 29c145851e5978f74c4a7de5ef132abc18d3244d..a043f298b491a0ff18d67e38a2363318b9b8cfd8 100644 (file)
--- a/src/libxl/xen_xl.c
+++ b/src/libxl/xen_xl.c
@@ -1395,7 +1395,8 @@ static int
 xenFormatXLVnode(virConfValuePtr list,
                  virBufferPtr buf)
 {
-    virConfValuePtr numaPnode, tmp;
+    virConfValuePtr numaPnode;
+    virConfValuePtr tmp;
 
     numaPnode = g_new0(virConfValue, 1);
 
@@ -1423,7 +1424,8 @@ xenFormatXLVnuma(virConfValuePtr list,
     int ret = -1;
     size_t i;
     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-    virConfValuePtr numaVnode, tmp;
+    virConfValuePtr numaVnode;
+    virConfValuePtr tmp;
     virBitmapPtr cpumask = virDomainNumaGetNodeCpumask(numa, node);
     size_t nodeSize = virDomainNumaGetNodeMemorySize(numa, node) / 1024;
     g_autofree char *nodeVcpus = NULL;
@@ -1638,7 +1640,8 @@ static int
 xenFormatXLDisk(virConfValuePtr list, virDomainDiskDefPtr disk)
 {
     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-    virConfValuePtr val, tmp;
+    virConfValuePtr val;
+    virConfValuePtr tmp;
     int format = virDomainDiskGetFormat(disk);
     const char *driver = virDomainDiskGetDriver(disk);
     g_autofree char *target = NULL;
@@ -1858,7 +1861,8 @@ xenFormatXLInputDevs(virConfPtr conf, virDomainDefPtr def)
 {
     size_t i;
     const char *devtype;
-    virConfValuePtr usbdevices = NULL, lastdev;
+    virConfValuePtr usbdevices = NULL;
+    virConfValuePtr lastdev;
 
     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
         usbdevices = g_new0(virConfValue, 1);
@@ -1941,7 +1945,8 @@ xenFormatXLUSBController(virConfPtr conf,
 
     for (i = 0; i < def->ncontrollers; i++) {
         if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) {
-            virConfValuePtr val, tmp;
+            virConfValuePtr val;
+            virConfValuePtr tmp;
             g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
 
             if (def->controllers[i]->model != -1) {
@@ -2019,7 +2024,8 @@ xenFormatXLUSB(virConfPtr conf,
     for (i = 0; i < def->nhostdevs; i++) {
         if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
             def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) {
-            virConfValuePtr val, tmp;
+            virConfValuePtr val;
+            virConfValuePtr tmp;
             char *buf;
 
             buf = g_strdup_printf("hostbus=%x,hostaddr=%x",
@@ -2055,7 +2061,8 @@ xenFormatXLChannel(virConfValuePtr list, virDomainChrDefPtr channel)
 {
     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     int sourceType = channel->source->type;
-    virConfValuePtr val, tmp;
+    virConfValuePtr val;
+    virConfValuePtr tmp;
 
     /* connection */
     virBufferAddLit(&buf, "connection=");
@@ -2145,7 +2152,8 @@ xenFormatXLDomainNamespaceData(virConfPtr conf, virDomainDefPtr def)
     args->list = NULL;
 
     for (i = 0; i < nsdata->num_args; i++) {
-        virConfValuePtr val, tmp;
+        virConfValuePtr val;
+        virConfValuePtr tmp;
 
         val = g_new0(virConfValue, 1);
 

diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c
index cc24317a7615977ac696aeeed45617473cee7ecf..a2c1682fcff73854251afb223f792b3c1cc9f71f 100644 (file)
--- a/src/libxl/xen_xm.c
+++ b/src/libxl/xen_xm.c
@@ -275,7 +275,8 @@ xenFormatXMDisk(virConfValuePtr list,
                 virDomainDiskDefPtr disk)
 {
     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-    virConfValuePtr val, tmp;
+    virConfValuePtr val;
+    virConfValuePtr tmp;
     const char *src = virDomainDiskGetSource(disk);
     int format = virDomainDiskGetFormat(disk);
     const char *driver = virDomainDiskGetDriver(disk);

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index f633a24b16178df955f566ca30245cde4a38bf0c..9b7cd6408d932ddad25b919b48324bb30e9ca105 100644 (file)
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -735,7 +735,8 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl)
 static int virLXCControllerSetupCpuAffinity(virLXCControllerPtr ctrl)
 {
     int hostcpus, maxcpu = CPU_SETSIZE;
-    virBitmapPtr cpumap, cpumapToSet;
+    virBitmapPtr cpumap;
+    virBitmapPtr cpumapToSet;
 
     VIR_DEBUG("Setting CPU affinity");
 

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 51a1d01ec907c6b219f4c18114ba3f6199b33563..8e0ec82e0b99c279e06d3ccc5ba5dd11ed767958 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -3129,9 +3129,11 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef,
                             virDomainDeviceDefPtr dev)
 {
     int ret = -1;
-    virDomainDiskDefPtr disk, det_disk;
+    virDomainDiskDefPtr disk;
+    virDomainDiskDefPtr det_disk;
     virDomainNetDefPtr net;
-    virDomainHostdevDefPtr hostdev, det_hostdev;
+    virDomainHostdevDefPtr hostdev;
+    virDomainHostdevDefPtr det_hostdev;
     int idx;
 
     switch (dev->type) {
@@ -4294,7 +4296,8 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr dom,
     virLXCDriverPtr driver = dom->conn->privateData;
     virDomainObjPtr vm = NULL;
     virDomainDefPtr vmdef = NULL;
-    virDomainDeviceDefPtr dev = NULL, dev_copy = NULL;
+    virDomainDeviceDefPtr dev = NULL;
+    virDomainDeviceDefPtr dev_copy = NULL;
     int ret = -1;
     virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver);
 
@@ -4468,7 +4471,8 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr dom,
     virCapsPtr caps = NULL;
     virDomainObjPtr vm = NULL;
     virDomainDefPtr vmdef = NULL;
-    virDomainDeviceDefPtr dev = NULL, dev_copy = NULL;
+    virDomainDeviceDefPtr dev = NULL;
+    virDomainDeviceDefPtr dev_copy = NULL;
     int ret = -1;
     virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver);
 

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 32872d7ec144c37f4b67064cd866816f54cf669a..3c7a49b115226fed3a42c291f4b6f0f92db12743 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -1065,7 +1065,10 @@ networkDnsmasqConfContents(virNetworkObjPtr obj,
     size_t i;
     virNetworkDNSDefPtr dns = &def->dns;
     bool wantDNS = dns->enable != VIR_TRISTATE_BOOL_NO;
-    virNetworkIPDefPtr tmpipdef, ipdef, ipv4def, ipv6def;
+    virNetworkIPDefPtr tmpipdef;
+    virNetworkIPDefPtr ipdef;
+    virNetworkIPDefPtr ipv4def;
+    virNetworkIPDefPtr ipv6def;
     bool ipv6SLAAC;
 
     *configstr = NULL;
@@ -1682,7 +1685,9 @@ networkRefreshDhcpDaemon(virNetworkDriverStatePtr driver,
     virNetworkDefPtr def = virNetworkObjGetDef(obj);
     size_t i;
     pid_t dnsmasqPid;
-    virNetworkIPDefPtr ipdef, ipv4def, ipv6def;
+    virNetworkIPDefPtr ipdef;
+    virNetworkIPDefPtr ipv4def;
+    virNetworkIPDefPtr ipv6def;
     g_autoptr(dnsmasqContext) dctx = NULL;
 
     /* if no IP addresses specified, nothing to do */

diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
index 813ab604ae675df99a81afc6e760d2ed7dcc15aa..f4afbf9ba2d5cad5de08b340c1065d593a696d21 100644 (file)
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -3199,7 +3199,8 @@ iptablesRuleInstCommand(virFirewallPtr fw,
                         const char *ifname,
                         virNWFilterRuleInstPtr rule)
 {
-    virNWFilterVarCombIterPtr vciter, tmp;
+    virNWFilterVarCombIterPtr vciter;
+    virNWFilterVarCombIterPtr tmp;
     int ret = -1;
 
     /* rule->vars holds all the variables names that this rule will access.
@@ -3234,7 +3235,8 @@ ebtablesRuleInstCommand(virFirewallPtr fw,
                         const char *ifname,
                         virNWFilterRuleInstPtr rule)
 {
-    virNWFilterVarCombIterPtr vciter, tmp;
+    virNWFilterVarCombIterPtr vciter;
+    virNWFilterVarCombIterPtr tmp;
     int ret = -1;
 
     /* rule->vars holds all the variables names that this rule will access.

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 96535a8216496bba3032d80f160dd049740de59b..e898af85abe30cb27306dd3635e560ee1d30d565 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -1817,7 +1817,8 @@ openvzUpdateDevice(virDomainDefPtr vmdef,
                    virDomainDeviceDefPtr dev,
                    bool persist)
 {
-    virDomainFSDefPtr fs, cur;
+    virDomainFSDefPtr fs;
+    virDomainFSDefPtr cur;
     int pos;
 
     if (dev->type == VIR_DOMAIN_DEVICE_FS) {

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 8b880d0d157c1ae69f9da9c152df3f54c7adc3a3..01ba2c78c1c201e2858a8b9e83b652ecec30446c 100644 (file)
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -1255,7 +1255,8 @@ int qemuAgentFSFreeze(qemuAgentPtr agent, const char **mountpoints,
                       unsigned int nmountpoints)
 {
     int ret = -1;
-    virJSONValuePtr cmd, arg = NULL;
+    virJSONValuePtr cmd;
+    virJSONValuePtr arg = NULL;
     virJSONValuePtr reply = NULL;
 
     if (mountpoints && nmountpoints) {

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index df332ad870976c96d30ee44d38616ac729129a57..ed2a1481d472d3c22271bd4640434b53db79a917 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6172,7 +6172,8 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver,
     if ((flags & VIR_DOMAIN_XML_MIGRATABLE)) {
         size_t i;
         int toremove = 0;
-        virDomainControllerDefPtr usb = NULL, pci = NULL;
+        virDomainControllerDefPtr usb = NULL;
+        virDomainControllerDefPtr pci = NULL;
 
         /* If only the default USB controller is present, we can remove it
          * and make the XML compatible with older versions of libvirt which

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c7323e1fa532cab3bec4d333cb07c8c5fa12f436..b7c89a826a4e1ae63bf3904cef8ef74793095c6a 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7431,12 +7431,16 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
                              unsigned int parse_flags,
                              virDomainXMLOptionPtr xmlopt)
 {
-    virDomainDiskDefPtr disk, det_disk;
+    virDomainDiskDefPtr disk;
+    virDomainDiskDefPtr det_disk;
     virDomainNetDefPtr net;
     virDomainSoundDefPtr sound;
-    virDomainHostdevDefPtr hostdev, det_hostdev;
-    virDomainLeaseDefPtr lease, det_lease;
-    virDomainControllerDefPtr cont, det_cont;
+    virDomainHostdevDefPtr hostdev;
+    virDomainHostdevDefPtr det_hostdev;
+    virDomainLeaseDefPtr lease;
+    virDomainLeaseDefPtr det_lease;
+    virDomainControllerDefPtr cont;
+    virDomainControllerDefPtr det_cont;
     virDomainChrDefPtr chr;
     virDomainFSDefPtr fs;
     virDomainMemoryDefPtr mem;
@@ -10240,7 +10244,8 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
     virDomainDefPtr def;
     virDomainDefPtr persistentDef;
     int ret = -1;
-    virDomainNetDefPtr net = NULL, persistentNet = NULL;
+    virDomainNetDefPtr net = NULL;
+    virDomainNetDefPtr persistentNet = NULL;
     g_autoptr(virNetDevBandwidth) bandwidth = NULL;
     g_autoptr(virNetDevBandwidth) newBandwidth = NULL;
     g_autoptr(virQEMUDriverConfig) cfg = NULL;

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index f706ef65fcd3ea53d20321932b11b41e389aa9f1..ad62e24cfc49ce3e9669568810e987dc4ab63f70 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4006,7 +4006,8 @@ static int
 qemuMonitorJSONQueryFdsetsParse(virJSONValuePtr msg,
                                 qemuMonitorFdsetsPtr *fdsets)
 {
-    virJSONValuePtr returnArray, entry;
+    virJSONValuePtr returnArray;
+    virJSONValuePtr entry;
     size_t i;
     g_autoptr(qemuMonitorFdsets) sets = g_new0(qemuMonitorFdsets, 1);
     int ninfo;
@@ -4213,7 +4214,10 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg,
 {
     int ret = -1;
     const char *tmp;
-    virJSONValuePtr returnArray, entry, table, element;
+    virJSONValuePtr returnArray;
+    virJSONValuePtr entry;
+    virJSONValuePtr table;
+    virJSONValuePtr element;
     size_t nTable;
     size_t i;
     virNetDevRxFilterPtr fil = virNetDevRxFilterNew();
@@ -5015,7 +5019,8 @@ int qemuMonitorJSONScreendump(qemuMonitorPtr mon,
                               const char *file)
 {
     int ret = -1;
-    virJSONValuePtr cmd, reply = NULL;
+    virJSONValuePtr cmd;
+    virJSONValuePtr reply = NULL;
 
     cmd = qemuMonitorJSONMakeCommand("screendump",
                                      "s:filename", file,
@@ -5386,7 +5391,8 @@ int qemuMonitorJSONOpenGraphics(qemuMonitorPtr mon,
                                 bool skipauth)
 {
     int ret = -1;
-    virJSONValuePtr cmd, reply = NULL;
+    virJSONValuePtr cmd;
+    virJSONValuePtr reply = NULL;
 
     cmd = qemuMonitorJSONMakeCommand("add_client",
                                      "s:protocol", protocol,

diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 2bb3443287c60968d8de658dc41732659ac924e0..6b9c1bbc64d5482693b183d44e817059ffbfc6bf 100644 (file)
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -263,7 +263,8 @@ int virNetServerClientAddFilter(virNetServerClientPtr client,
 void virNetServerClientRemoveFilter(virNetServerClientPtr client,
                                     int filterID)
 {
-    virNetServerClientFilterPtr tmp, prev;
+    virNetServerClientFilterPtr tmp;
+    virNetServerClientFilterPtr prev;
 
     virObjectLock(client);
 

diff --git a/src/security/security_stack.c b/src/security/security_stack.c
index 3bfcb1e2f7595e0f901946f2777dc67f09244ad4..2fd7d2e825b51f6f2ed9d0adf91ea4993a715a66 100644 (file)
--- a/src/security/security_stack.c
+++ b/src/security/security_stack.c
@@ -90,7 +90,8 @@ static int
 virSecurityStackClose(virSecurityManagerPtr mgr)
 {
     virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr);
-    virSecurityStackItemPtr next, item = priv->itemsHead;
+    virSecurityStackItemPtr item = priv->itemsHead;
+    virSecurityStackItemPtr next;
 
     while (item) {
         next = item->next;

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 2c1b4cb525815e42f3e9724aac8c7084c66a1a1e..01b3e7bc821cf7b9d2a927569aeb371686d425a1 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -7338,7 +7338,8 @@ testNodeDeviceMockCreateVport(testDriverPtr driver,
 {
     virNodeDeviceDefPtr def = NULL;
     virNodeDevCapsDefPtr caps;
-    virNodeDeviceObjPtr obj = NULL, objcopy = NULL;
+    virNodeDeviceObjPtr obj = NULL;
+    virNodeDeviceObjPtr objcopy = NULL;
     virNodeDeviceDefPtr objdef;
     virObjectEventPtr event = NULL;
     g_autofree char *xml = NULL;

diff --git a/src/util/virconf.c b/src/util/virconf.c
index 16107bce96a064651a86f5e64cd86f5a005e1147..25a3bad50deac7468f91b279364b7af3b72aa818 100644 (file)
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -207,7 +207,8 @@ virConfCreate(const char *filename, unsigned int flags)
 static virConfEntryPtr
 virConfAddEntry(virConfPtr conf, char *name, virConfValuePtr value, char *comm)
 {
-    virConfEntryPtr ret, prev;
+    virConfEntryPtr ret;
+    virConfEntryPtr prev;
 
     if (conf == NULL)
         return NULL;
@@ -441,7 +442,10 @@ virConfParseString(virConfParserCtxtPtr ctxt)
 static virConfValuePtr
 virConfParseValue(virConfParserCtxtPtr ctxt)
 {
-    virConfValuePtr ret, lst = NULL, tmp, prev;
+    virConfValuePtr ret;
+    virConfValuePtr lst = NULL;
+    virConfValuePtr tmp;
+    virConfValuePtr prev;
     virConfType type = VIR_CONF_NONE;
     char *str = NULL;
     long long l = 0;
@@ -1332,7 +1336,8 @@ virConfSetValue(virConfPtr conf,
                 const char *setting,
                 virConfValuePtr value)
 {
-    virConfEntryPtr cur, prev = NULL;
+    virConfEntryPtr cur;
+    virConfEntryPtr prev = NULL;
 
     if (value && value->type == VIR_CONF_STRING && value->str == NULL) {
         virConfFreeValue(value);

diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index 77a97176b0d9002c44776a4f9a2eca07587e43a1..f39635b35ff67a4ab87d78bebe42cc568a3636c1 100644 (file)
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -193,7 +193,8 @@ virNetDevBandwidthSet(const char *ifname,
                       bool swapped)
 {
     int ret = -1;
-    virNetDevBandwidthRatePtr rx = NULL, tx = NULL; /* From domain POV */
+    virNetDevBandwidthRatePtr rx = NULL; /* From domain POV */
+    virNetDevBandwidthRatePtr tx = NULL; /* From domain POV */
     virCommandPtr cmd = NULL;
     char *average = NULL;
     char *peak = NULL;

diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h
index fff83222a9a0a8b35b51f2b2bbb9f4f18d46facb..91de9323bacddaad4377be41aca20b518f5a6f80 100644 (file)
--- a/src/util/virnetdevbandwidth.h
+++ b/src/util/virnetdevbandwidth.h
@@ -33,7 +33,8 @@ struct _virNetDevBandwidthRate {
 typedef struct _virNetDevBandwidth virNetDevBandwidth;
 typedef virNetDevBandwidth *virNetDevBandwidthPtr;
 struct _virNetDevBandwidth {
-    virNetDevBandwidthRatePtr in, out;
+    virNetDevBandwidthRatePtr in;
+    virNetDevBandwidthRatePtr out;
 };
 
 void virNetDevBandwidthFree(virNetDevBandwidthPtr def);

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 520ef871e97f65583612a42f12eefb0143952539..f3ad22c27037d813086d3acfae40061d9e3ea0b1 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -408,7 +408,8 @@ vzConnectOpen(virConnectPtr conn,
 static int
 vzConnectClose(virConnectPtr conn)
 {
-    vzConnPtr curr, *prev = &vz_conn_list;
+    vzConnPtr curr;
+    vzConnPtr *prev = &vz_conn_list;
     vzConnPtr privconn = conn->privateData;
 
     if (!privconn)

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index d8548e5a3cfad14d19ca4611f878dc5610e1b265..ea21181c259eb6bccd5789febbe3b1466dc064e1 100644 (file)
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -889,7 +889,8 @@ prlsdkParseNetAddress(char *addr)
     char *maskstr = NULL;
     int nbits;
     virSocketAddr mask;
-    virNetDevIPAddrPtr ip = NULL, ret = NULL;
+    virNetDevIPAddrPtr ip = NULL;
+    virNetDevIPAddrPtr ret = NULL;
 
     if (!(maskstr = strchr(addr, '/')))
         goto cleanup;
@@ -3141,12 +3142,14 @@ static int prlsdkConfigureGateways(PRL_HANDLE sdknet, virDomainNetDefPtr net)
 {
     int ret = -1;
     size_t i;
-    virNetDevIPRoutePtr route4 = NULL, route6 = NULL;
+    virNetDevIPRoutePtr route4 = NULL;
+    virNetDevIPRoutePtr route6 = NULL;
     char *gw4 = NULL, *gw6 = NULL;
     PRL_RESULT pret;
 
     for (i = 0; i < net->guestIP.nroutes; i++) {
-        virSocketAddrPtr addrdst, gateway;
+        virSocketAddrPtr addrdst;
+        virSocketAddrPtr gateway;
         virSocketAddr zero;
 
         addrdst = virNetDevIPRouteGetAddress(net->guestIP.routes[i]);

diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c
index fb40fe9b806faadad542c780385f73d219475efd..c77c21611f93e54dbfe96835ae915f4088fe935f 100644 (file)
--- a/tests/virnetdaemontest.c
+++ b/tests/virnetdaemontest.c
@@ -84,9 +84,12 @@ static virNetServerPtr
 testCreateServer(const char *server_name, const char *host, int family)
 {
     virNetServerPtr srv = NULL;
-    virNetServerServicePtr svc1 = NULL, svc2 = NULL;
-    virNetServerClientPtr cln1 = NULL, cln2 = NULL;
-    virNetSocketPtr sk1 = NULL, sk2 = NULL;
+    virNetServerServicePtr svc1 = NULL;
+    virNetServerServicePtr svc2 = NULL;
+    virNetServerClientPtr cln1 = NULL;
+    virNetServerClientPtr cln2 = NULL;
+    virNetSocketPtr sk1 = NULL;
+    virNetSocketPtr sk2 = NULL;
     int fdclient[2];
 
     if (socketpair(PF_UNIX, SOCK_STREAM, 0, fdclient) < 0) {
@@ -269,7 +272,8 @@ static int testExecRestart(const void *opaque)
     const struct testExecRestartData *data = opaque;
     char *infile = NULL, *outfile = NULL;
     char *injsonstr = NULL, *outjsonstr = NULL;
-    virJSONValuePtr injson = NULL, outjson = NULL;
+    virJSONValuePtr injson = NULL;
+    virJSONValuePtr outjson = NULL;
     int fdclient[2] = { -1, -1 }, fdserver[2] = { -1, -1 };
 
     if (socketpair(PF_UNIX, SOCK_STREAM, 0, fdclient) < 0) {

diff --git a/tests/virpcitest.c b/tests/virpcitest.c
index 6a4bd5518da63dea61fd43c0175f3c52c9d08315..b6ca686c5c7b280acad305687c32be383d4edb24 100644 (file)
--- a/tests/virpcitest.c
+++ b/tests/virpcitest.c
@@ -93,7 +93,8 @@ testVirPCIDeviceDetach(const void *opaque G_GNUC_UNUSED)
     int ret = -1;
     virPCIDevicePtr dev[] = {NULL, NULL, NULL};
     size_t i, nDev = G_N_ELEMENTS(dev);
-    virPCIDeviceListPtr activeDevs = NULL, inactiveDevs = NULL;
+    virPCIDeviceListPtr activeDevs = NULL;
+    virPCIDeviceListPtr inactiveDevs = NULL;
     int count;
 
     if (!(activeDevs = virPCIDeviceListNew()) ||
@@ -136,7 +137,8 @@ testVirPCIDeviceReset(const void *opaque G_GNUC_UNUSED)
     int ret = -1;
     virPCIDevicePtr dev[] = {NULL, NULL, NULL};
     size_t i, nDev = G_N_ELEMENTS(dev);
-    virPCIDeviceListPtr activeDevs = NULL, inactiveDevs = NULL;
+    virPCIDeviceListPtr activeDevs = NULL;
+    virPCIDeviceListPtr inactiveDevs = NULL;
     int count;
 
     if (!(activeDevs = virPCIDeviceListNew()) ||
@@ -173,7 +175,8 @@ testVirPCIDeviceReattach(const void *opaque G_GNUC_UNUSED)
     int ret = -1;
     virPCIDevicePtr dev[] = {NULL, NULL, NULL};
     size_t i, nDev = G_N_ELEMENTS(dev);
-    virPCIDeviceListPtr activeDevs = NULL, inactiveDevs = NULL;
+    virPCIDeviceListPtr activeDevs = NULL;
+    virPCIDeviceListPtr inactiveDevs = NULL;
     int count;
 
     if (!(activeDevs = virPCIDeviceListNew()) ||