util: clang is failing to compile due to unused variables.

After some recent patches, clang is throwing some errors related to
unused variables. This is not happening when we use GCC with -Werror
enabled. Only clang reports this warning.

make[3]: Entering directory '/home/julio/Desktop/virt/libvirt/src'
  CC       util/libvirt_util_la-virscsivhost.lo
  CC       util/libvirt_util_la-virusb.lo
  CC       util/libvirt_util_la-virmdev.lo
util/virmdev.c:373:36: error: unused variable 'ret' [-Werror,-Wunused-variable]
    VIR_AUTOPTR(virMediatedDevice) ret = virMediatedDeviceListSteal(list, dev);
                                   ^
1 error generated.
Makefile:11579: recipe for target 'util/libvirt_util_la-virmdev.lo' failed
make[3]: *** [util/libvirt_util_la-virmdev.lo] Error 1
make[3]: *** Waiting for unfinished jobs....
util/virscsivhost.c:112:37: error: unused variable 'tmp' [-Werror,-Wunused-variable]
    VIR_AUTOPTR(virSCSIVHostDevice) tmp = virSCSIVHostDeviceListSteal(list, dev);
                                    ^
1 error generated.
Makefile:11411: recipe for target 'util/libvirt_util_la-virscsivhost.lo' failed
make[3]: *** [util/libvirt_util_la-virscsivhost.lo] Error 1
util/virusb.c:511:31: error: unused variable 'ret' [-Werror,-Wunused-variable]
    VIR_AUTOPTR(virUSBDevice) ret = virUSBDeviceListSteal(list, dev);

Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/util/virmdev.c b/src/util/virmdev.c
index 4050835cc1955de70ac352bb6a4325d8ce9be05b..10a2b08337019f8b22b34b8b8e871903f4c7f5b6 100644 (file)
--- a/src/util/virmdev.c
+++ b/src/util/virmdev.c
@@ -370,7 +370,7 @@ void
 virMediatedDeviceListDel(virMediatedDeviceListPtr list,
                          virMediatedDevicePtr dev)
 {
-    VIR_AUTOPTR(virMediatedDevice) ret = virMediatedDeviceListSteal(list, dev);
+    virMediatedDeviceFree(virMediatedDeviceListSteal(list, dev));
 }
 
 

diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c
index 280d0dc2fd1c3a7a10b27b08fe551f7d63727c14..ab17b1e831c0060921b7209c8a46a5c97c80b911 100644 (file)
--- a/src/util/virscsivhost.c
+++ b/src/util/virscsivhost.c
@@ -109,7 +109,7 @@ void
 virSCSIVHostDeviceListDel(virSCSIVHostDeviceListPtr list,
                           virSCSIVHostDevicePtr dev)
 {
-    VIR_AUTOPTR(virSCSIVHostDevice) tmp = virSCSIVHostDeviceListSteal(list, dev);
+    virSCSIVHostDeviceFree(virSCSIVHostDeviceListSteal(list, dev));
 }
 
 

diff --git a/src/util/virusb.c b/src/util/virusb.c
index 609d54836fc3e41ce4b719730fdcf6d860486458..b033b2b80dc6aba00046271b1e895ce0f21fd758 100644 (file)
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -508,7 +508,7 @@ void
 virUSBDeviceListDel(virUSBDeviceListPtr list,
                     virUSBDevicePtr dev)
 {
-    VIR_AUTOPTR(virUSBDevice) ret = virUSBDeviceListSteal(list, dev);
+    virUSBDeviceFree(virUSBDeviceListSteal(list, dev));
 }
 
 virUSBDevicePtr