util: Use a semicolon for all VIR_DEFINE_AUTOPTR_FUNC

For consistency, let's use the semicolon for all definitions.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h
index 2460684a00d0433e0411f1469e3eef4d8da12c95..233ebe772bca3f579c6e2adb2dabc2d220766816 100644 (file)
--- a/src/qemu/qemu_migration_params.h
+++ b/src/qemu/qemu_migration_params.h
@@ -90,7 +90,7 @@ qemuMigrationParamsNew(void);
 
 void
 qemuMigrationParamsFree(qemuMigrationParamsPtr migParams);
-VIR_DEFINE_AUTOPTR_FUNC(qemuMigrationParams, qemuMigrationParamsFree)
+VIR_DEFINE_AUTOPTR_FUNC(qemuMigrationParams, qemuMigrationParamsFree);
 
 int
 qemuMigrationParamsApply(virQEMUDriverPtr driver,

diff --git a/src/util/virauthconfig.h b/src/util/virauthconfig.h
index 93bb4346169415ab8968d360f11b1727c8f3f875..603ef89d25e4157bea17acdceb06619d6d496daa 100644 (file)
--- a/src/util/virauthconfig.h
+++ b/src/util/virauthconfig.h
@@ -41,6 +41,6 @@ int virAuthConfigLookup(virAuthConfigPtr auth,
                         const char *credname,
                         const char **value);
 
-VIR_DEFINE_AUTOPTR_FUNC(virAuthConfig, virAuthConfigFree)
+VIR_DEFINE_AUTOPTR_FUNC(virAuthConfig, virAuthConfigFree);
 
 #endif /* LIBVIRT_VIRAUTHCONFIG_H */

diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h
index dfb30b3bc88590380ecd4594b503fd934f967263..c54e203971f0ae1ff08dd2d3dbca238054fbc169 100644 (file)
--- a/src/util/virbitmap.h
+++ b/src/util/virbitmap.h
@@ -154,6 +154,6 @@ void virBitmapSubtract(virBitmapPtr a, virBitmapPtr b)
 
 void virBitmapShrink(virBitmapPtr map, size_t b);
 
-VIR_DEFINE_AUTOPTR_FUNC(virBitmap, virBitmapFree)
+VIR_DEFINE_AUTOPTR_FUNC(virBitmap, virBitmapFree);
 
 #endif /* LIBVIRT_VIRBITMAP_H */

diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
index 95c0dd1b964af01a21e6ef5c7836c95561f4bbf7..01d71f1b59262101c7ea6e17fd68f06e173ec65b 100644 (file)
--- a/src/util/virbuffer.c
+++ b/src/util/virbuffer.c
@@ -661,7 +661,7 @@ virBufferEscapePairFree(virBufferEscapePairPtr pair)
     VIR_FREE(pair);
 }
 
-VIR_DEFINE_AUTOPTR_FUNC(virBufferEscapePair, virBufferEscapePairFree)
+VIR_DEFINE_AUTOPTR_FUNC(virBufferEscapePair, virBufferEscapePairFree);
 
 
 /**

diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h
index c3703710b73ec17b85509e71557cb43608283093..8bf6bee6441ad48367454a79691935a47a2256db 100644 (file)
--- a/src/util/virbuffer.h
+++ b/src/util/virbuffer.h
@@ -119,6 +119,6 @@ int virBufferGetIndent(const virBuffer *buf, bool dynamic);
 void virBufferTrim(virBufferPtr buf, const char *trim, int len);
 void virBufferAddStr(virBufferPtr buf, const char *str);
 
-VIR_DEFINE_AUTOPTR_FUNC(virBuffer, virBufferFreeAndReset)
+VIR_DEFINE_AUTOPTR_FUNC(virBuffer, virBufferFreeAndReset);
 
 #endif /* LIBVIRT_VIRBUFFER_H */

diff --git a/src/util/vircommand.h b/src/util/vircommand.h
index dbf50418907849e8c95add9e888929605959557d..99849051f8edfee1fa68f148cdcb4e4cfc766c4b 100644 (file)
--- a/src/util/vircommand.h
+++ b/src/util/vircommand.h
@@ -219,6 +219,6 @@ int virCommandRunNul(virCommandPtr cmd,
                      virCommandRunNulFunc func,
                      void *data);
 
-VIR_DEFINE_AUTOPTR_FUNC(virCommand, virCommandFree)
+VIR_DEFINE_AUTOPTR_FUNC(virCommand, virCommandFree);
 
 #endif /* LIBVIRT_VIRCOMMAND_H */

diff --git a/src/util/virerror.h b/src/util/virerror.h
index d9d3109a4c4442a4e7d5a1e355de543fd65562b2..213bc3f606b9a8f6023a703e1646c72a3f0639fa 100644 (file)
--- a/src/util/virerror.h
+++ b/src/util/virerror.h
@@ -206,6 +206,6 @@ bool virLastErrorIsSystemErrno(int errnum);
 void virErrorPreserveLast(virErrorPtr *saveerr);
 void virErrorRestore(virErrorPtr *savederr);
 
-VIR_DEFINE_AUTOPTR_FUNC(virError, virFreeError)
+VIR_DEFINE_AUTOPTR_FUNC(virError, virFreeError);
 
 #endif /* LIBVIRT_VIRERROR_H */

diff --git a/src/util/virfile.h b/src/util/virfile.h
index 65432da13a50d21d9807b65900e43b5b2ca1bb92..be612af77085bfdc4d90af81d94251eee5d64e88 100644 (file)
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -383,7 +383,7 @@ int virFileInData(int fd,
                   int *inData,
                   long long *length);
 
-VIR_DEFINE_AUTOPTR_FUNC(virFileWrapperFd, virFileWrapperFdFree)
+VIR_DEFINE_AUTOPTR_FUNC(virFileWrapperFd, virFileWrapperFdFree);
 
 int virFileGetXAttr(const char *path,
                     const char *name,

diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h
index 2a6fc30eb7f59edb1bcaef9f8488ec6ff36d84a9..e3ad1adb6b8b7d156d1c4d43ce9c2df2463bce3d 100644 (file)
--- a/src/util/virfirewall.h
+++ b/src/util/virfirewall.h
@@ -115,6 +115,6 @@ int virFirewallApply(virFirewallPtr firewall);
 
 void virFirewallSetLockOverride(bool avoid);
 
-VIR_DEFINE_AUTOPTR_FUNC(virFirewall, virFirewallFree)
+VIR_DEFINE_AUTOPTR_FUNC(virFirewall, virFirewallFree);
 
 #endif /* LIBVIRT_VIRFIREWALL_H */

diff --git a/src/util/virhash.h b/src/util/virhash.h
index 0c849561f8a8cf81a7922e1f48b188335057fdb6..2df1a5d12a8a08a3235d172577aed30571ad69c0 100644 (file)
--- a/src/util/virhash.h
+++ b/src/util/virhash.h
@@ -197,6 +197,6 @@ void *virHashSearch(const virHashTable *table, virHashSearcher iter,
 /* Convenience for when VIR_FREE(value) is sufficient as a data freer.  */
 void virHashValueFree(void *value, const void *name);
 
-VIR_DEFINE_AUTOPTR_FUNC(virHashTable, virHashFree)
+VIR_DEFINE_AUTOPTR_FUNC(virHashTable, virHashFree);
 
 #endif /* LIBVIRT_VIRHASH_H */

diff --git a/src/util/virjson.h b/src/util/virjson.h
index d815e60de931bd26d209df4a1b374da87d2f422f..3dee103abacd492b09e27824f4bb6f02aa2e232f 100644 (file)
--- a/src/util/virjson.h
+++ b/src/util/virjson.h
@@ -158,6 +158,6 @@ char *virJSONStringReformat(const char *jsonstr, bool pretty);
 
 virJSONValuePtr virJSONValueObjectDeflatten(virJSONValuePtr json);
 
-VIR_DEFINE_AUTOPTR_FUNC(virJSONValue, virJSONValueFree)
+VIR_DEFINE_AUTOPTR_FUNC(virJSONValue, virJSONValueFree);
 
 #endif /* LIBVIRT_VIRJSON_H */

diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h
index 3999de3421fa03bfc7ed368769d7674d0afe78b6..1deaf087e082641f7919c772cdaab14a06ec590a 100644 (file)
--- a/src/util/virmacaddr.h
+++ b/src/util/virmacaddr.h
@@ -64,6 +64,6 @@ bool virMacAddrIsMulticast(const virMacAddr *addr);
 bool virMacAddrIsBroadcastRaw(const unsigned char s[VIR_MAC_BUFLEN]);
 void virMacAddrFree(virMacAddrPtr addr);
 
-VIR_DEFINE_AUTOPTR_FUNC(virMacAddr, virMacAddrFree)
+VIR_DEFINE_AUTOPTR_FUNC(virMacAddr, virMacAddrFree);
 
 #endif /* LIBVIRT_VIRMACADDR_H */

diff --git a/src/util/virmdev.h b/src/util/virmdev.h
index aafc8b931788a319b3579541b5cd8796a6ce7f0b..d787d354e4691778f697a17fea281a8978855358 100644 (file)
--- a/src/util/virmdev.h
+++ b/src/util/virmdev.h
@@ -137,7 +137,7 @@ int
 virMediatedDeviceTypeReadAttrs(const char *sysfspath,
                                virMediatedDeviceTypePtr *type);
 
-VIR_DEFINE_AUTOPTR_FUNC(virMediatedDevice, virMediatedDeviceFree)
-VIR_DEFINE_AUTOPTR_FUNC(virMediatedDeviceType, virMediatedDeviceTypeFree)
+VIR_DEFINE_AUTOPTR_FUNC(virMediatedDevice, virMediatedDeviceFree);
+VIR_DEFINE_AUTOPTR_FUNC(virMediatedDeviceType, virMediatedDeviceTypeFree);
 
 #endif /* LIBVIRT_VIRMDEV_H */

diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 50947b302b9b4f9d53e66a0655513a0c81c98cef..aeb9caab2a1174706e1aa1a42a66c5a27eccdbda 100644 (file)
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -121,7 +121,7 @@ virNetDevMcastEntryFree(virNetDevMcastEntryPtr entry)
     VIR_FREE(entry);
 }
 
-VIR_DEFINE_AUTOPTR_FUNC(virNetDevMcastEntry, virNetDevMcastEntryFree)
+VIR_DEFINE_AUTOPTR_FUNC(virNetDevMcastEntry, virNetDevMcastEntryFree);
 
 typedef struct _virNetDevMcastList virNetDevMcastList;
 typedef virNetDevMcastList *virNetDevMcastListPtr;

diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
index 3982097cdfd7ac74fcbf079506db72795e8f0dd3..6f6094eebe8572d28f5b5e138eb7a6d8f23bfc92 100644 (file)
--- a/src/util/virnetdev.h
+++ b/src/util/virnetdev.h
@@ -311,6 +311,6 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link,
 int virNetDevRunEthernetScript(const char *ifname, const char *script)
     ATTRIBUTE_NOINLINE;
 
-VIR_DEFINE_AUTOPTR_FUNC(virNetDevRxFilter, virNetDevRxFilterFree)
+VIR_DEFINE_AUTOPTR_FUNC(virNetDevRxFilter, virNetDevRxFilterFree);
 
 #endif /* LIBVIRT_VIRNETDEV_H */

diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h
index 1ecb4eae01ae3dd5084898f3c7b88b72824271ac..376ac32c4788394df64f6b01b91961e5f8dddcb4 100644 (file)
--- a/src/util/virnetdevip.h
+++ b/src/util/virnetdevip.h
@@ -94,7 +94,7 @@ void virNetDevIPInfoClear(virNetDevIPInfoPtr ip);
 int virNetDevIPInfoAddToDev(const char *ifname,
                             virNetDevIPInfo const *ipInfo);
 
-VIR_DEFINE_AUTOPTR_FUNC(virNetDevIPAddr, virNetDevIPAddrFree)
-VIR_DEFINE_AUTOPTR_FUNC(virNetDevIPRoute, virNetDevIPRouteFree)
+VIR_DEFINE_AUTOPTR_FUNC(virNetDevIPAddr, virNetDevIPAddrFree);
+VIR_DEFINE_AUTOPTR_FUNC(virNetDevIPRoute, virNetDevIPRouteFree);
 
 #endif /* LIBVIRT_VIRNETDEVIP_H */

diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h
index 8fe3a4dfa7a7423e12dbe446c81ec817c6da6755..2a1375955083e5479930eede132c3f590cd2a0f9 100644 (file)
--- a/src/util/virnetdevvlan.h
+++ b/src/util/virnetdevvlan.h
@@ -48,6 +48,6 @@ void virNetDevVlanFree(virNetDevVlanPtr vlan);
 int virNetDevVlanEqual(const virNetDevVlan *a, const virNetDevVlan *b);
 int virNetDevVlanCopy(virNetDevVlanPtr dst, const virNetDevVlan *src);
 
-VIR_DEFINE_AUTOPTR_FUNC(virNetDevVlan, virNetDevVlanFree)
+VIR_DEFINE_AUTOPTR_FUNC(virNetDevVlan, virNetDevVlanFree);
 
 #endif /* LIBVIRT_VIRNETDEVVLAN_H */

diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index 62066a33d2cbe8914362848b16145ae8b3b60fd5..1d8467e6432f13c556957ba604438e357ed1bde4 100644 (file)
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -63,7 +63,7 @@ typedef struct nl_handle virNetlinkHandle;
 typedef struct nl_sock virNetlinkHandle;
 # endif
 
-VIR_DEFINE_AUTOPTR_FUNC(virNetlinkHandle, virNetlinkFree)
+VIR_DEFINE_AUTOPTR_FUNC(virNetlinkHandle, virNetlinkFree);
 
 typedef struct _virNetlinkEventSrvPrivate virNetlinkEventSrvPrivate;
 typedef virNetlinkEventSrvPrivate *virNetlinkEventSrvPrivatePtr;

diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h
index 37442be44c4cd8a0b62a71200cb4e7ba57157850..9dd7b3c3ed83f5189ac8ee4c319535f14d89331e 100644 (file)
--- a/src/util/virnetlink.h
+++ b/src/util/virnetlink.h
@@ -37,7 +37,7 @@
 #  endif
 
 typedef struct nl_msg virNetlinkMsg;
-VIR_DEFINE_AUTOPTR_FUNC(virNetlinkMsg, nlmsg_free)
+VIR_DEFINE_AUTOPTR_FUNC(virNetlinkMsg, nlmsg_free);
 
 # else
 

diff --git a/src/util/virpci.h b/src/util/virpci.h
index 0b35228e3d86fa5f8abd48aad1372257c0b29f7f..c8fc1e8bf628b6f8a02f0972438dc8f893a7756e 100644 (file)
--- a/src/util/virpci.h
+++ b/src/util/virpci.h
@@ -271,8 +271,8 @@ ssize_t virPCIGetMdevTypes(const char *sysfspath,
 
 void virPCIDeviceAddressFree(virPCIDeviceAddressPtr address);
 
-VIR_DEFINE_AUTOPTR_FUNC(virPCIDevice, virPCIDeviceFree)
-VIR_DEFINE_AUTOPTR_FUNC(virPCIDeviceAddress, virPCIDeviceAddressFree)
-VIR_DEFINE_AUTOPTR_FUNC(virPCIEDeviceInfo, virPCIEDeviceInfoFree)
+VIR_DEFINE_AUTOPTR_FUNC(virPCIDevice, virPCIDeviceFree);
+VIR_DEFINE_AUTOPTR_FUNC(virPCIDeviceAddress, virPCIDeviceAddressFree);
+VIR_DEFINE_AUTOPTR_FUNC(virPCIEDeviceInfo, virPCIEDeviceInfoFree);
 
 #endif /* LIBVIRT_VIRPCI_H */

diff --git a/src/util/virperf.h b/src/util/virperf.h
index 0d026e80c207db15e520709848e90c01e0694c96..3cd26563b4be944ebb1684ff27eb6526b2d2a278 100644 (file)
--- a/src/util/virperf.h
+++ b/src/util/virperf.h
@@ -82,6 +82,6 @@ int virPerfReadEvent(virPerfPtr perf,
                      virPerfEventType type,
                      uint64_t *value);
 
-VIR_DEFINE_AUTOPTR_FUNC(virPerf, virPerfFree)
+VIR_DEFINE_AUTOPTR_FUNC(virPerf, virPerfFree);
 
 #endif /* LIBVIRT_VIRPERF_H */

diff --git a/src/util/virscsi.c b/src/util/virscsi.c
index 715064d669fb063ad41f01a830e23037ab38bd98..b27831f0b3720e352af34ebfd964167b327625b7 100644 (file)
--- a/src/util/virscsi.c
+++ b/src/util/virscsi.c
@@ -248,7 +248,7 @@ virSCSIDeviceUsedByInfoFree(virUsedByInfoPtr used_by)
     VIR_FREE(used_by->domname);
     VIR_FREE(used_by);
 }
-VIR_DEFINE_AUTOPTR_FUNC(virUsedByInfo, virSCSIDeviceUsedByInfoFree)
+VIR_DEFINE_AUTOPTR_FUNC(virUsedByInfo, virSCSIDeviceUsedByInfoFree);
 
 void
 virSCSIDeviceFree(virSCSIDevicePtr dev)

diff --git a/src/util/virscsi.h b/src/util/virscsi.h
index fd5986d2c02225d504481f01dd7bdb4ed2d1d081..70e113b4861a0f3ac562d4778d483f139f881c64 100644 (file)
--- a/src/util/virscsi.h
+++ b/src/util/virscsi.h
@@ -93,6 +93,6 @@ void virSCSIDeviceListDel(virSCSIDeviceListPtr list,
 virSCSIDevicePtr virSCSIDeviceListFind(virSCSIDeviceListPtr list,
                                        virSCSIDevicePtr dev);
 
-VIR_DEFINE_AUTOPTR_FUNC(virSCSIDevice, virSCSIDeviceFree)
+VIR_DEFINE_AUTOPTR_FUNC(virSCSIDevice, virSCSIDeviceFree);
 
 #endif /* LIBVIRT_VIRSCSI_H */

diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h
index 5440db16b2b933e5b34b0960ada30f8db53de8be..d28773482c886e1ed5256cda52ea6513badc4b80 100644 (file)
--- a/src/util/virscsivhost.h
+++ b/src/util/virscsivhost.h
@@ -61,6 +61,6 @@ void virSCSIVHostDeviceGetUsedBy(virSCSIVHostDevicePtr dev,
 void virSCSIVHostDeviceFree(virSCSIVHostDevicePtr dev);
 int virSCSIVHostOpenVhostSCSI(int *vhostfd) ATTRIBUTE_NOINLINE;
 
-VIR_DEFINE_AUTOPTR_FUNC(virSCSIVHostDevice, virSCSIVHostDeviceFree)
+VIR_DEFINE_AUTOPTR_FUNC(virSCSIVHostDevice, virSCSIVHostDeviceFree);
 
 #endif /* LIBVIRT_VIRSCSIVHOST_H */

diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h
index 64bcbb36dc5c179290374a34694c4abb04dc0000..f6caa4fcf5429bb9cf02574965035c3c5020f584 100644 (file)
--- a/src/util/virsocketaddr.h
+++ b/src/util/virsocketaddr.h
@@ -160,6 +160,6 @@ int virSocketAddrPTRDomain(const virSocketAddr *addr,
 
 void virSocketAddrFree(virSocketAddrPtr addr);
 
-VIR_DEFINE_AUTOPTR_FUNC(virSocketAddr, virSocketAddrFree)
+VIR_DEFINE_AUTOPTR_FUNC(virSocketAddr, virSocketAddrFree);
 
 #endif /* LIBVIRT_VIRSOCKETADDR_H */

diff --git a/src/util/virstring.h b/src/util/virstring.h
index 42848e62b1e4532d5335144f89412aa6c7a4641e..aef82471c29fbd6f6ba2b2ef1127657cc697b63f 100644 (file)
--- a/src/util/virstring.h
+++ b/src/util/virstring.h
@@ -307,6 +307,6 @@ int virStringParsePort(const char *str,
                        unsigned int *port)
     ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
 
-VIR_DEFINE_AUTOPTR_FUNC(virString, virStringListFree)
+VIR_DEFINE_AUTOPTR_FUNC(virString, virStringListFree);
 
 #endif /* LIBVIRT_VIRSTRING_H */

diff --git a/src/util/virusb.h b/src/util/virusb.h
index e589a4531089d34ffc1e1f9b9241cedfd9df57f0..6ed71606d4e8b874540829746ff994858a70d5dd 100644 (file)
--- a/src/util/virusb.h
+++ b/src/util/virusb.h
@@ -96,6 +96,6 @@ void virUSBDeviceListDel(virUSBDeviceListPtr list,
 virUSBDevicePtr virUSBDeviceListFind(virUSBDeviceListPtr list,
                                      virUSBDevicePtr dev);
 
-VIR_DEFINE_AUTOPTR_FUNC(virUSBDevice, virUSBDeviceFree)
+VIR_DEFINE_AUTOPTR_FUNC(virUSBDevice, virUSBDeviceFree);
 
 #endif /* LIBVIRT_VIRUSB_H */