[libvirt] [PATCH 10/35] conf: use G_GNUC_UNUSED

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/conf/capabilities.c | 6 +- src/conf/domain_addr.c | 22 ++++---- src/conf/domain_audit.c | 2 +- src/conf/domain_capabilities.c | 2 +- src/conf/domain_conf.c | 28 +++++----- src/conf/domain_event.c | 2 +- src/conf/network_conf.c | 80 +++++++++++++-------------- src/conf/node_device_conf.c | 10 ++-- src/conf/nwfilter_conf.c | 50 ++++++++--------- src/conf/nwfilter_params.c | 2 +- src/conf/object_event.c | 2 +- src/conf/virchrdev.c | 10 ++-- src/conf/virdomaincheckpointobjlist.c | 2 +- src/conf/virdomainmomentobjlist.c | 6 +- src/conf/virdomainobjlist.c | 12 ++-- src/conf/virinterfaceobj.c | 10 ++-- src/conf/virnetworkobj.c | 18 +++--- src/conf/virnodedeviceobj.c | 16 +++--- src/conf/virnwfilterbindingobjlist.c | 4 +- src/conf/virsecretobj.c | 8 +-- src/conf/virstorageobj.c | 22 ++++---- 21 files changed, 157 insertions(+), 157 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 7419d9cfc8..1781c1df0a 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1485,8 +1485,8 @@ virCapabilitiesGetNodeInfo(virNodeInfoPtr nodeinfo) /* returns 1 on success, 0 if the detection failed and -1 on hard error */ static int -virCapabilitiesFillCPUInfo(int cpu_id ATTRIBUTE_UNUSED, - virCapsHostNUMACellCPUPtr cpu ATTRIBUTE_UNUSED) +virCapabilitiesFillCPUInfo(int cpu_id G_GNUC_UNUSED, + virCapsHostNUMACellCPUPtr cpu G_GNUC_UNUSED) { #ifdef __linux__ cpu->id = cpu_id; @@ -1592,7 +1592,7 @@ virCapabilitiesInitNUMAFake(virCapsPtr caps) int ncpus; int s, c, t; int id, cid; - int onlinecpus ATTRIBUTE_UNUSED; + int onlinecpus G_GNUC_UNUSED; bool tmp; if (virCapabilitiesGetNodeInfo(&nodeinfo) < 0) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 4e02c43375..fc612ee6a2 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1301,8 +1301,8 @@ virDomainPCIAddressReserveNextAddr(virDomainPCIAddressSetPtr addrs, static int -virDomainPCIAddressSetMultiIter(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainPCIAddressSetMultiIter(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *data) { @@ -1335,9 +1335,9 @@ virDomainPCIAddressSetMultiIter(virDomainDefPtr def ATTRIBUTE_UNUSED, static int virDomainPCIAddressSetAllMultiIter(virDomainDefPtr def, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, - void *data ATTRIBUTE_UNUSED) + void *data G_GNUC_UNUSED) { virPCIDeviceAddressPtr testAddr; @@ -1463,8 +1463,8 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev, } static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) -virDomainCCWAddressAllocate(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainCCWAddressAllocate(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *data) { @@ -1472,8 +1472,8 @@ virDomainCCWAddressAllocate(virDomainDefPtr def ATTRIBUTE_UNUSED, } static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) -virDomainCCWAddressValidate(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainCCWAddressValidate(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *data) { @@ -1682,8 +1682,8 @@ virDomainVirtioSerialAddrSetFree(virDomainVirtioSerialAddrSetPtr addrs) * opaque should be the address set */ static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) -virDomainVirtioSerialAddrReserve(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainVirtioSerialAddrReserve(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *data) { @@ -2422,7 +2422,7 @@ virDomainUSBAddressAssign(virDomainUSBAddressSetPtr addrs, int virDomainUSBAddressPresent(virDomainDeviceInfoPtr info, - void *data ATTRIBUTE_UNUSED) + void *data G_GNUC_UNUSED) { if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB && virDomainUSBAddressPortIsValid(info->addr.usb.port)) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index cc5a55a635..e455661e4f 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -59,7 +59,7 @@ virDomainAuditGetRdev(const char *path) } #else static char * -virDomainAuditGetRdev(const char *path ATTRIBUTE_UNUSED) +virDomainAuditGetRdev(const char *path G_GNUC_UNUSED) { return NULL; } diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index fe93388cce..b0fdd15d6c 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -690,7 +690,7 @@ virDomainCapsDeviceRNGDefValidate(virDomainCapsPtr const caps, int virDomainCapsDeviceDefValidate(virDomainCapsPtr const caps, const virDomainDeviceDef *dev, - const virDomainDef *def ATTRIBUTE_UNUSED) + const virDomainDef *def G_GNUC_UNUSED) { int ret = 0; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 35a51f1793..6bd2d4935d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4073,8 +4073,8 @@ virDomainDeviceSetData(virDomainDeviceDefPtr device, static int -virDomainDefHasDeviceAddressIterator(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainDefHasDeviceAddressIterator(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *opaque) { @@ -5191,8 +5191,8 @@ virDomainVsockDefPostParse(virDomainVsockDefPtr vsock) static int virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev, const virDomainDef *def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt) { int ret = -1; @@ -5509,7 +5509,7 @@ struct virDomainDefPostParseDeviceIteratorData { static int virDomainDefPostParseDeviceIterator(virDomainDefPtr def, virDomainDeviceDefPtr dev, - virDomainDeviceInfoPtr info ATTRIBUTE_UNUSED, + virDomainDeviceInfoPtr info G_GNUC_UNUSED, void *opaque) { struct virDomainDefPostParseDeviceIteratorData *data = opaque; @@ -5579,8 +5579,8 @@ virDomainDefPostParseCPU(virDomainDefPtr def) static int -virDomainDefCollectBootOrder(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainDefCollectBootOrder(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *data) { @@ -6612,7 +6612,7 @@ virDomainDeviceDefValidate(const virDomainDeviceDef *dev, static int virDomainDefValidateDeviceIterator(virDomainDefPtr def, virDomainDeviceDefPtr dev, - virDomainDeviceInfoPtr info ATTRIBUTE_UNUSED, + virDomainDeviceInfoPtr info G_GNUC_UNUSED, void *opaque) { struct virDomainDefPostParseDeviceIteratorData *data = opaque; @@ -7461,7 +7461,7 @@ virDomainDeviceAliasIsUserAlias(const char *aliasStr) * @param node XML nodeset to parse for device address definition */ static int -virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt ATTRIBUTE_UNUSED, +virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt G_GNUC_UNUSED, xmlNodePtr node, virDomainDeviceInfoPtr info, unsigned int flags) @@ -8506,7 +8506,7 @@ virDomainNetDefCoalesceFormatXML(virBufferPtr buf, static int -virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATTRIBUTE_UNUSED, +virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED, xmlXPathContextPtr ctxt, const char *type, virDomainHostdevDefPtr def) @@ -29065,8 +29065,8 @@ struct _virDomainCompatibleDeviceData { }; static int -virDomainDeviceInfoCheckBootIndex(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr device ATTRIBUTE_UNUSED, +virDomainDeviceInfoCheckBootIndex(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr device G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *opaque) { @@ -30114,7 +30114,7 @@ typedef struct { } virDomainDefFindDeviceCallbackData; static int -virDomainDefFindDeviceCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, +virDomainDefFindDeviceCallback(virDomainDefPtr def G_GNUC_UNUSED, virDomainDeviceDefPtr dev, virDomainDeviceInfoPtr info, void *opaque) @@ -31034,7 +31034,7 @@ virDomainNetNotifyActualDevice(virConnectPtr conn, int virDomainNetReleaseActualDevice(virConnectPtr conn, - virDomainDefPtr dom ATTRIBUTE_UNUSED, + virDomainDefPtr dom G_GNUC_UNUSED, virDomainNetDefPtr iface) { virNetworkPtr net = NULL; diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 40031a46c8..c0dcf8f716 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -2227,7 +2227,7 @@ virDomainEventStateDeregister(virConnectPtr conn, * event should be dispatched. */ static bool -virDomainQemuMonitorEventFilter(virConnectPtr conn ATTRIBUTE_UNUSED, +virDomainQemuMonitorEventFilter(virConnectPtr conn G_GNUC_UNUSED, virObjectEventPtr event, void *opaque) { diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index beeb760e2d..58a0e32dd7 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -76,7 +76,7 @@ VIR_ENUM_IMPL(virNetworkTaint, static virClassPtr virNetworkXMLOptionClass; static void -virNetworkXMLOptionDispose(void *obj ATTRIBUTE_UNUSED) +virNetworkXMLOptionDispose(void *obj G_GNUC_UNUSED) { return; } @@ -2418,7 +2418,7 @@ virNetworkForwardNatDefFormat(virBufferPtr buf, int virNetworkDefFormatBuf(virBufferPtr buf, const virNetworkDef *def, - virNetworkXMLOptionPtr xmlopt ATTRIBUTE_UNUSED, + virNetworkXMLOptionPtr xmlopt G_GNUC_UNUSED, unsigned int flags) { const unsigned char *uuid; @@ -2812,11 +2812,11 @@ virNetworkDefUpdateCheckElementName(virNetworkDefPtr def, static int virNetworkDefUpdateBridge(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { virNetworkDefUpdateNoSupport(def, "bridge"); return -1; @@ -2825,11 +2825,11 @@ virNetworkDefUpdateBridge(virNetworkDefPtr def, static int virNetworkDefUpdateDomain(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { virNetworkDefUpdateNoSupport(def, "domain"); return -1; @@ -2838,11 +2838,11 @@ virNetworkDefUpdateDomain(virNetworkDefPtr def, static int virNetworkDefUpdateIP(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { virNetworkDefUpdateNoSupport(def, "ip"); return -1; @@ -2919,7 +2919,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, int parentIndex, xmlXPathContextPtr ctxt, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i; int ret = -1; @@ -3059,7 +3059,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, int parentIndex, xmlXPathContextPtr ctxt, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i; int ret = -1; @@ -3157,11 +3157,11 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, static int virNetworkDefUpdateForward(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { virNetworkDefUpdateNoSupport(def, "forward"); return -1; @@ -3171,10 +3171,10 @@ virNetworkDefUpdateForward(virNetworkDefPtr def, static int virNetworkDefUpdateForwardInterface(virNetworkDefPtr def, unsigned int command, - int parentIndex ATTRIBUTE_UNUSED, + int parentIndex G_GNUC_UNUSED, xmlXPathContextPtr ctxt, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i; int ret = -1; @@ -3265,11 +3265,11 @@ virNetworkDefUpdateForwardInterface(virNetworkDefPtr def, static int virNetworkDefUpdateForwardPF(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { virNetworkDefUpdateNoSupport(def, "forward pf"); return -1; @@ -3279,10 +3279,10 @@ virNetworkDefUpdateForwardPF(virNetworkDefPtr def, static int virNetworkDefUpdatePortGroup(virNetworkDefPtr def, unsigned int command, - int parentIndex ATTRIBUTE_UNUSED, + int parentIndex G_GNUC_UNUSED, xmlXPathContextPtr ctxt, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i; int foundName = -1, foundDefault = -1; @@ -3373,11 +3373,11 @@ virNetworkDefUpdatePortGroup(virNetworkDefPtr def, static int virNetworkDefUpdateDNSHost(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i, j, k; int foundIdx = -1, ret = -1; @@ -3468,11 +3468,11 @@ virNetworkDefUpdateDNSHost(virNetworkDefPtr def, static int virNetworkDefUpdateDNSSrv(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i; int foundIdx = -1, ret = -1; @@ -3555,11 +3555,11 @@ virNetworkDefUpdateDNSSrv(virNetworkDefPtr def, static int virNetworkDefUpdateDNSTxt(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { int foundIdx, ret = -1; virNetworkDNSDefPtr dns = &def->dns; diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 84fcbd3e78..3aba04c54c 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2619,21 +2619,21 @@ virNodeDeviceGetPCIDynamicCaps(const char *sysfsPath, #else int -virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host ATTRIBUTE_UNUSED) +virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host G_GNUC_UNUSED) { return -1; } int -virNodeDeviceGetPCIDynamicCaps(const char *sysfsPath ATTRIBUTE_UNUSED, - virNodeDevCapPCIDevPtr pci_dev ATTRIBUTE_UNUSED) +virNodeDeviceGetPCIDynamicCaps(const char *sysfsPath G_GNUC_UNUSED, + virNodeDevCapPCIDevPtr pci_dev G_GNUC_UNUSED) { return -1; } -int virNodeDeviceGetSCSITargetCaps(const char *sysfsPath ATTRIBUTE_UNUSED, - virNodeDevCapSCSITargetPtr scsi_target ATTRIBUTE_UNUSED) +int virNodeDeviceGetSCSITargetCaps(const char *sysfsPath G_GNUC_UNUSED, + virNodeDevCapSCSITargetPtr scsi_target G_GNUC_UNUSED) { return -1; } diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index d21eebf19d..6b7a606b64 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -448,8 +448,8 @@ static const struct int_map macProtoMap[] = { static bool checkMacProtocolID(enum attrDatatype datatype, union data *value, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, - nwItemDesc *item ATTRIBUTE_UNUSED) + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, + nwItemDesc *item G_GNUC_UNUSED) { int32_t res = -1; @@ -477,7 +477,7 @@ checkMacProtocolID(enum attrDatatype datatype, static bool macProtocolIDFormatter(virBufferPtr buf, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { const char *str = NULL; bool asHex = true; @@ -500,7 +500,7 @@ static bool checkVlanVlanID(enum attrDatatype datatype, union data *value, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { int32_t res; @@ -522,7 +522,7 @@ static bool checkVlanProtocolID(enum attrDatatype datatype, union data *value, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { int32_t res = -1; @@ -550,7 +550,7 @@ checkVlanProtocolID(enum attrDatatype datatype, static bool vlanProtocolIDFormatter(virBufferPtr buf, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { const char *str = NULL; bool asHex = true; @@ -600,10 +600,10 @@ checkValidMask(unsigned char *data, static bool -checkMACMask(enum attrDatatype datatype ATTRIBUTE_UNUSED, +checkMACMask(enum attrDatatype datatype G_GNUC_UNUSED, union data *macMask, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, - nwItemDesc *item ATTRIBUTE_UNUSED) + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, + nwItemDesc *item G_GNUC_UNUSED) { return checkValidMask(macMask->uc, 6); } @@ -630,7 +630,7 @@ static bool arpOpcodeValidator(enum attrDatatype datatype, union data *value, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { int32_t res = -1; @@ -655,7 +655,7 @@ arpOpcodeValidator(enum attrDatatype datatype, static bool arpOpcodeFormatter(virBufferPtr buf, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { const char *str = NULL; @@ -692,7 +692,7 @@ static bool checkIPProtocolID(enum attrDatatype datatype, union data *value, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { int32_t res = -1; @@ -717,7 +717,7 @@ checkIPProtocolID(enum attrDatatype datatype, static bool formatIPProtocolID(virBufferPtr buf, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { const char *str = NULL; bool asHex = true; @@ -740,7 +740,7 @@ static bool dscpValidator(enum attrDatatype datatype, union data *val, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { uint8_t dscp = val->ui; if (dscp > 63) @@ -857,7 +857,7 @@ virNWFilterPrintStateMatchFlags(virBufferPtr buf, static bool -stateValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, +stateValidator(enum attrDatatype datatype G_GNUC_UNUSED, union data *val, virNWFilterRuleDefPtr nwf, nwItemDesc *item) @@ -879,7 +879,7 @@ stateValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, static bool stateFormatter(virBufferPtr buf, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { virNWFilterPrintStateMatchFlags(buf, "", item->u.u16, true); @@ -902,9 +902,9 @@ static const struct int_map tcpFlags[] = { static bool -tcpFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, +tcpFlagsValidator(enum attrDatatype datatype G_GNUC_UNUSED, union data *val, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { bool rc = false; @@ -959,7 +959,7 @@ virNWFilterPrintTCPFlags(uint8_t flags) static bool tcpFlagsFormatter(virBufferPtr buf, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { printTCPFlags(buf, item->u.tcpFlags.mask); @@ -971,9 +971,9 @@ tcpFlagsFormatter(virBufferPtr buf, static bool -ipsetValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, +ipsetValidator(enum attrDatatype datatype G_GNUC_UNUSED, union data *val, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { const char *errmsg = NULL; @@ -1000,7 +1000,7 @@ ipsetValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, static bool ipsetFormatter(virBufferPtr buf, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { virBufferAdd(buf, item->u.ipset.setname, -1); @@ -1010,9 +1010,9 @@ ipsetFormatter(virBufferPtr buf, static bool -ipsetFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, +ipsetFlagsValidator(enum attrDatatype datatype G_GNUC_UNUSED, union data *val, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { const char *errmsg = NULL; @@ -1050,7 +1050,7 @@ ipsetFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, static bool ipsetFlagsFormatter(virBufferPtr buf, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { uint8_t ctr; diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 4b85f22950..7640717948 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -623,7 +623,7 @@ virNWFilterVarCombIterGetVarValue(virNWFilterVarCombIterPtr ci, } static void -hashDataFree(void *payload, const void *name ATTRIBUTE_UNUSED) +hashDataFree(void *payload, const void *name G_GNUC_UNUSED) { virNWFilterVarValueFree(payload); } diff --git a/src/conf/object_event.c b/src/conf/object_event.c index a50a09e1a0..453fab74b1 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -543,7 +543,7 @@ static void virObjectEventStateFlush(virObjectEventStatePtr state); * flush the callback queue. */ static void -virObjectEventTimer(int timer ATTRIBUTE_UNUSED, void *opaque) +virObjectEventTimer(int timer G_GNUC_UNUSED, void *opaque) { virObjectEventStatePtr state = opaque; diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 5090a67a4f..59d4864735 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -195,12 +195,12 @@ static void virChrdevLockFileRemove(const char *dev) } #else /* #ifdef VIR_CHRDEV_LOCK_FILE_PATH */ /* file locking for character devices is disabled */ -static int virChrdevLockFileCreate(const char *dev ATTRIBUTE_UNUSED) +static int virChrdevLockFileCreate(const char *dev G_GNUC_UNUSED) { return 0; } -static void virChrdevLockFileRemove(const char *dev ATTRIBUTE_UNUSED) +static void virChrdevLockFileRemove(const char *dev G_GNUC_UNUSED) { return; } @@ -245,7 +245,7 @@ static void virChrdevFDStreamCloseCbFree(void *opaque) * @st Pointer to stream being closed. * @opaque Domain's device information structure. */ -static void virChrdevFDStreamCloseCb(virStreamPtr st ATTRIBUTE_UNUSED, +static void virChrdevFDStreamCloseCb(virStreamPtr st G_GNUC_UNUSED, void *opaque) { virChrdevStreamInfoPtr priv = opaque; @@ -291,8 +291,8 @@ virChrdevsPtr virChrdevAlloc(void) * Helper to clear stream callbacks when freeing the hash */ static int virChrdevFreeClearCallbacks(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *data ATTRIBUTE_UNUSED) + const void *name G_GNUC_UNUSED, + void *data G_GNUC_UNUSED) { virStreamPtr st = payload; diff --git a/src/conf/virdomaincheckpointobjlist.c b/src/conf/virdomaincheckpointobjlist.c index 03aad9f5ef..41181477f4 100644 --- a/src/conf/virdomaincheckpointobjlist.c +++ b/src/conf/virdomaincheckpointobjlist.c @@ -48,7 +48,7 @@ virDomainCheckpointAssignDef(virDomainCheckpointObjListPtr checkpoints, static bool -virDomainCheckpointFilter(virDomainMomentObjPtr obj ATTRIBUTE_UNUSED, +virDomainCheckpointFilter(virDomainMomentObjPtr obj G_GNUC_UNUSED, unsigned int flags) { /* For now, we have no further filters than what the common code handles. */ diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentobjlist.c index d02efb420a..a4f9ce9c3f 100644 --- a/src/conf/virdomainmomentobjlist.c +++ b/src/conf/virdomainmomentobjlist.c @@ -263,7 +263,7 @@ virDomainMomentAssignDef(virDomainMomentObjListPtr moments, static void virDomainMomentObjListDataFree(void *payload, - const void *name ATTRIBUTE_UNUSED) + const void *name G_GNUC_UNUSED) { virDomainMomentObjPtr obj = payload; @@ -310,7 +310,7 @@ struct virDomainMomentNameData { static int virDomainMomentObjListCopyNames(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virDomainMomentObjPtr obj = payload; @@ -497,7 +497,7 @@ struct moment_set_relation { }; static int virDomainMomentSetRelations(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *data) { virDomainMomentObjPtr obj = payload; diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 2eff6768c2..fa1985f474 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -95,7 +95,7 @@ static void virDomainObjListDispose(void *obj) static int virDomainObjListSearchID(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *data) { virDomainObjPtr obj = (virDomainObjPtr)payload; @@ -655,7 +655,7 @@ struct virDomainObjListData { static int virDomainObjListCount(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virDomainObjPtr obj = payload; @@ -702,7 +702,7 @@ struct virDomainIDData { static int virDomainObjListCopyActiveIDs(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virDomainObjPtr obj = payload; @@ -747,7 +747,7 @@ struct virDomainNameData { static int virDomainObjListCopyInactiveNames(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virDomainObjPtr obj = payload; @@ -804,7 +804,7 @@ struct virDomainListIterData { static int virDomainObjListHelper(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virDomainListIterData *data = opaque; @@ -932,7 +932,7 @@ struct virDomainListData { static int virDomainObjListCollectIterator(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virDomainListData *data = opaque; diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index c8d931a4b6..b77d4152f5 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -161,7 +161,7 @@ struct _virInterfaceObjFindMACData { static int virInterfaceObjListFindByMACStringCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virInterfaceObjPtr obj = payload; @@ -273,7 +273,7 @@ struct _virInterfaceObjListExportData { static int virInterfaceObjListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virInterfaceObjListExportDataPtr data = opaque; @@ -366,7 +366,7 @@ struct _virInterfaceObjListCloneData { static int virInterfaceObjListCloneCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virInterfaceObjPtr srcObj = payload; @@ -485,7 +485,7 @@ struct _virInterfaceObjNumOfInterfacesData { static int virInterfaceObjListNumOfInterfacesCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virInterfaceObjPtr obj = payload; @@ -527,7 +527,7 @@ struct _virInterfaceObjGetNamesData { static int virInterfaceObjListGetNamesCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virInterfaceObjPtr obj = payload; diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 69a962b466..966956e719 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -94,7 +94,7 @@ virNetworkObjLoadAllPorts(virNetworkObjPtr net, static void -virNetworkObjPortFree(void *val, const void *key ATTRIBUTE_UNUSED) +virNetworkObjPortFree(void *val, const void *key G_GNUC_UNUSED) { virNetworkPortDefFree(val); } @@ -404,7 +404,7 @@ virNetworkObjFindByUUID(virNetworkObjListPtr nets, static int virNetworkObjSearchName(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *data) { virNetworkObjPtr obj = (virNetworkObjPtr) payload; @@ -1190,7 +1190,7 @@ struct virNetworkObjBridgeInUseHelperData { static int virNetworkObjBridgeInUseHelper(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { int ret; @@ -1367,7 +1367,7 @@ struct _virNetworkObjListExportData { static int virNetworkObjListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNetworkObjListExportDataPtr data = opaque; @@ -1451,7 +1451,7 @@ struct virNetworkObjListForEachHelperData { static int virNetworkObjListForEachHelper(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virNetworkObjListForEachHelperData *data = opaque; @@ -1501,7 +1501,7 @@ struct virNetworkObjListGetHelperData { static int virNetworkObjListGetHelper(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virNetworkObjListGetHelperData *data = opaque; @@ -1591,7 +1591,7 @@ struct virNetworkObjListPruneHelperData { static int virNetworkObjListPruneHelper(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { const struct virNetworkObjListPruneHelperData *data = opaque; @@ -1773,7 +1773,7 @@ struct _virNetworkObjPortListExportData { static int virNetworkObjPortListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNetworkObjPortListExportDataPtr data = opaque; @@ -1853,7 +1853,7 @@ struct _virNetworkObjPortListForEachData { static int virNetworkObjPortForEachCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNetworkObjPortListForEachData *data = opaque; diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 37d9de478f..7656a5eed2 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -199,7 +199,7 @@ virNodeDeviceObjListSearch(virNodeDeviceObjListPtr devs, static int virNodeDeviceObjListFindBySysfsPathCallback(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virNodeDeviceObjPtr obj = (virNodeDeviceObjPtr) payload; @@ -256,7 +256,7 @@ struct virNodeDeviceObjListFindByWWNsData { static int virNodeDeviceObjListFindByWWNsCallback(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virNodeDeviceObjPtr obj = (virNodeDeviceObjPtr) payload; @@ -292,7 +292,7 @@ virNodeDeviceObjListFindByWWNs(virNodeDeviceObjListPtr devs, static int virNodeDeviceObjListFindByFabricWWNCallback(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virNodeDeviceObjPtr obj = (virNodeDeviceObjPtr) payload; @@ -322,7 +322,7 @@ virNodeDeviceObjListFindByFabricWWN(virNodeDeviceObjListPtr devs, static int virNodeDeviceObjListFindByCapCallback(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virNodeDeviceObjPtr obj = (virNodeDeviceObjPtr) payload; @@ -354,7 +354,7 @@ struct virNodeDeviceObjListFindSCSIHostByWWNsData { static int virNodeDeviceObjListFindSCSIHostByWWNsCallback(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virNodeDeviceObjPtr obj = (virNodeDeviceObjPtr) payload; @@ -694,7 +694,7 @@ struct virNodeDeviceCountData { static int virNodeDeviceObjListNumOfDevicesCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNodeDeviceObjPtr obj = payload; @@ -742,7 +742,7 @@ struct virNodeDeviceGetNamesData { static int virNodeDeviceObjListGetNamesCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNodeDeviceObjPtr obj = payload; @@ -852,7 +852,7 @@ struct _virNodeDeviceObjListExportData { static int virNodeDeviceObjListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNodeDeviceObjPtr obj = payload; diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c index 9fe62ed4ed..97e4d3c49b 100644 --- a/src/conf/virnwfilterbindingobjlist.c +++ b/src/conf/virnwfilterbindingobjlist.c @@ -345,7 +345,7 @@ struct virNWFilterBindingListIterData { static int virNWFilterBindingObjListHelper(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virNWFilterBindingListIterData *data = opaque; @@ -379,7 +379,7 @@ struct virNWFilterBindingListData { static int virNWFilterBindingObjListCollectIterator(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virNWFilterBindingListData *data = opaque; diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 5bd84d82ed..f9f222dcd3 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -197,7 +197,7 @@ virSecretObjListFindByUUID(virSecretObjListPtr secrets, static int virSecretObjSearchName(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virSecretObjPtr obj = (virSecretObjPtr) payload; @@ -410,7 +410,7 @@ struct virSecretCountData { static int virSecretObjListNumOfSecretsCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virSecretCountData *data = opaque; @@ -443,7 +443,7 @@ struct virSecretListData { static int virSecretObjListGetUUIDsCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virSecretListData *data = opaque; @@ -537,7 +537,7 @@ struct _virSecretObjListExportData { static int virSecretObjListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virSecretObjListExportDataPtr data = opaque; diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 286192172d..664dc12776 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -421,7 +421,7 @@ struct _virStoragePoolObjListForEachData { static int virStoragePoolObjListForEachCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStoragePoolObjPtr obj = payload; @@ -477,7 +477,7 @@ struct _virStoragePoolObjListSearchData { static int virStoragePoolObjListSearchCb(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virStoragePoolObjPtr obj = (virStoragePoolObjPtr) payload; @@ -728,7 +728,7 @@ struct _virStoragePoolObjForEachVolData { static int virStoragePoolObjForEachVolumeCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { int ret = 0; @@ -767,7 +767,7 @@ struct _virStoragePoolObjSearchVolData { static int virStoragePoolObjSearchVolumeCb(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virStorageVolObjPtr volobj = (virStorageVolObjPtr) payload; @@ -864,7 +864,7 @@ struct _virStorageVolObjCountData { static int virStoragePoolObjNumOfVolumesCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStorageVolObjPtr volobj = payload; @@ -913,7 +913,7 @@ struct _virStorageVolObjNameData { static int virStoragePoolObjVolumeGetNamesCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStorageVolObjPtr volobj = payload; @@ -987,7 +987,7 @@ struct _virStoragePoolObjVolumeListExportData { static int virStoragePoolObjVolumeListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStorageVolObjPtr volobj = payload; @@ -1437,7 +1437,7 @@ struct _virStoragePoolObjFindDuplicateData { static int virStoragePoolObjSourceFindDuplicateCb(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virStoragePoolObjPtr obj = (virStoragePoolObjPtr) payload; @@ -1847,7 +1847,7 @@ struct _virStoragePoolCountData { static int virStoragePoolObjNumOfStoragePoolsCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStoragePoolObjPtr obj = payload; @@ -1899,7 +1899,7 @@ struct _virStoragePoolNameData { static int virStoragePoolObjGetNamesCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStoragePoolObjPtr obj = payload; @@ -2046,7 +2046,7 @@ struct _virStoragePoolObjListExportData { static int virStoragePoolObjListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStoragePoolObjPtr obj = payload; -- 2.19.2