lxc: use G_GNUC_UNUSED

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED.

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

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 76014f3bfd4e3c2fd6c63f6968defd103449c9d4..5efb495b56a7be6e83a69a1c0d166458e2d335d5 100644 (file)
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -272,7 +272,7 @@ struct _virLXCCgroupDevicePolicy {
 
 
 int
-virLXCSetupHostUSBDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
+virLXCSetupHostUSBDeviceCgroup(virUSBDevicePtr dev G_GNUC_UNUSED,
                                const char *path,
                                void *opaque)
 {
@@ -288,7 +288,7 @@ virLXCSetupHostUSBDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
 
 
 int
-virLXCTeardownHostUSBDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
+virLXCTeardownHostUSBDeviceCgroup(virUSBDevicePtr dev G_GNUC_UNUSED,
                                   const char *path,
                                   void *opaque)
 {

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 97f9055506d22cbf0b0a49ba06499b208c570cd9..2a0b04117e6b31d34eb501ff411d4cd64712c50a 100644 (file)
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -1035,8 +1035,8 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def,
     return ret;
 }
 #else
-static int lxcContainerMountProcFuse(virDomainDefPtr def ATTRIBUTE_UNUSED,
-                                     const char *stateDir ATTRIBUTE_UNUSED)
+static int lxcContainerMountProcFuse(virDomainDefPtr def G_GNUC_UNUSED,
+                                     const char *stateDir G_GNUC_UNUSED)
 {
     return 0;
 }
@@ -1305,7 +1305,7 @@ lxcContainerMountDetectFilesystem(const char *src, char **type)
 }
 #else /* ! WITH_BLKID */
 static int
-lxcContainerMountDetectFilesystem(const char *src ATTRIBUTE_UNUSED,
+lxcContainerMountDetectFilesystem(const char *src G_GNUC_UNUSED,
                                   char **type)
 {
     /* No libblkid, so just return success with no detected type */
@@ -2083,8 +2083,8 @@ static int lxcContainerDropCapabilities(virDomainDefPtr def,
     return 0;
 }
 #else
-static int lxcContainerDropCapabilities(virDomainDefPtr def ATTRIBUTE_UNUSED,
-                                        bool keepReboot ATTRIBUTE_UNUSED)
+static int lxcContainerDropCapabilities(virDomainDefPtr def G_GNUC_UNUSED,
+                                        bool keepReboot G_GNUC_UNUSED)
 {
     VIR_WARN("libcap-ng support not compiled in, unable to clear capabilities");
     return 0;

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 9097655b4d2ea6011ff26a8bacad41d3ea93e720..a1f4ae88126cf86834dcd2a055e66c641e9e580c 100644 (file)
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -150,7 +150,7 @@ static void virLXCControllerFree(virLXCControllerPtr ctrl);
 static int virLXCControllerEventSendInit(virLXCControllerPtr ctrl,
                                          pid_t initpid);
 
-static void virLXCControllerQuitTimer(int timer ATTRIBUTE_UNUSED, void *opaque)
+static void virLXCControllerQuitTimer(int timer G_GNUC_UNUSED, void *opaque)
 {
     virLXCControllerPtr ctrl = opaque;
 
@@ -1027,7 +1027,7 @@ static virMutex lock = VIR_MUTEX_INITIALIZER;
 
 
 static void virLXCControllerSignalChildIO(virNetDaemonPtr dmn,
-                                          siginfo_t *info ATTRIBUTE_UNUSED,
+                                          siginfo_t *info G_GNUC_UNUSED,
                                           void *opaque)
 {
     virLXCControllerPtr ctrl = opaque;

diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index c4360f25f663d4c847b3ab875b4dd377b92202a9..4339d305a9813921e5c85657469f3ca5808519d6 100644 (file)
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -84,7 +84,7 @@ virLXCDomainObjFreeJob(virLXCDomainObjPrivatePtr priv)
  * Successful calls must be followed by EndJob eventually.
  */
 int
-virLXCDomainObjBeginJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED,
+virLXCDomainObjBeginJob(virLXCDriverPtr driver G_GNUC_UNUSED,
                        virDomainObjPtr obj,
                        enum virLXCDomainJob job)
 {
@@ -136,7 +136,7 @@ virLXCDomainObjBeginJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED,
  * earlier virLXCDomainBeginJob() call
  */
 void
-virLXCDomainObjEndJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED,
+virLXCDomainObjEndJob(virLXCDriverPtr driver G_GNUC_UNUSED,
                      virDomainObjPtr obj)
 {
     virLXCDomainObjPrivatePtr priv = obj->privateData;
@@ -151,7 +151,7 @@ virLXCDomainObjEndJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED,
 
 
 static void *
-virLXCDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
+virLXCDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED)
 {
     virLXCDomainObjPrivatePtr priv;
 
@@ -326,7 +326,7 @@ virLXCDomainObjPrivateXMLFormat(virBufferPtr buf,
 static int
 virLXCDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
                                virDomainObjPtr vm,
-                               virDomainDefParserConfigPtr config ATTRIBUTE_UNUSED)
+                               virDomainDefParserConfigPtr config G_GNUC_UNUSED)
 {
     virLXCDomainObjPrivatePtr priv = vm->privateData;
     long long thepid;
@@ -352,9 +352,9 @@ virDomainXMLPrivateDataCallbacks virLXCDriverPrivateDataCallbacks = {
 static int
 virLXCDomainDefPostParse(virDomainDefPtr def,
                          virCapsPtr caps,
-                         unsigned int parseFlags ATTRIBUTE_UNUSED,
-                         void *opaque ATTRIBUTE_UNUSED,
-                         void *parseOpaque ATTRIBUTE_UNUSED)
+                         unsigned int parseFlags G_GNUC_UNUSED,
+                         void *opaque G_GNUC_UNUSED,
+                         void *parseOpaque G_GNUC_UNUSED)
 {
     /* check for emulator and create a default one if needed */
     if (!def->emulator &&
@@ -367,11 +367,11 @@ virLXCDomainDefPostParse(virDomainDefPtr def,
 
 static int
 virLXCDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
-                               const virDomainDef *def ATTRIBUTE_UNUSED,
-                               virCapsPtr caps ATTRIBUTE_UNUSED,
-                               unsigned int parseFlags ATTRIBUTE_UNUSED,
-                               void *opaque ATTRIBUTE_UNUSED,
-                               void *parseOpaque ATTRIBUTE_UNUSED)
+                               const virDomainDef *def G_GNUC_UNUSED,
+                               virCapsPtr caps G_GNUC_UNUSED,
+                               unsigned int parseFlags G_GNUC_UNUSED,
+                               void *opaque G_GNUC_UNUSED,
+                               void *parseOpaque G_GNUC_UNUSED)
 {
     if (dev->type == VIR_DOMAIN_DEVICE_CHR &&
         dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE &&
@@ -415,7 +415,7 @@ struct _lxcDomainInitctlCallbackData {
 
 
 static int
-lxcDomainInitctlCallback(pid_t pid ATTRIBUTE_UNUSED,
+lxcDomainInitctlCallback(pid_t pid G_GNUC_UNUSED,
                          void *opaque)
 {
     lxcDomainInitctlCallbackData *data = opaque;

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index c0bbeb09e8cb23c224410db9c0ab4cc0236da6c8..5c7a9140b240d3e090390479d5e7054cdff12617 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -133,8 +133,8 @@ lxcConnectURIProbe(char **uri)
 
 
 static virDrvOpenStatus lxcConnectOpen(virConnectPtr conn,
-                                       virConnectAuthPtr auth ATTRIBUTE_UNUSED,
-                                       virConfPtr conf ATTRIBUTE_UNUSED,
+                                       virConnectAuthPtr auth G_GNUC_UNUSED,
+                                       virConfPtr conf G_GNUC_UNUSED,
                                        unsigned int flags)
 {
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
@@ -174,21 +174,21 @@ static int lxcConnectClose(virConnectPtr conn)
 }
 
 
-static int lxcConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED)
+static int lxcConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED)
 {
     /* Trivially secure, since always inside the daemon */
     return 1;
 }
 
 
-static int lxcConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED)
+static int lxcConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED)
 {
     /* Not encrypted, but remote driver takes care of that */
     return 0;
 }
 
 
-static int lxcConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED)
+static int lxcConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED)
 {
     return 1;
 }
@@ -1536,8 +1536,8 @@ lxcSecurityInit(virLXCDriverConfigPtr cfg)
 
 
 static int lxcStateInitialize(bool privileged,
-                              virStateInhibitCallback callback ATTRIBUTE_UNUSED,
-                              void *opaque ATTRIBUTE_UNUSED)
+                              virStateInhibitCallback callback G_GNUC_UNUSED,
+                              void *opaque G_GNUC_UNUSED)
 {
     virCapsPtr caps = NULL;
     virLXCDriverConfigPtr cfg = NULL;
@@ -3577,7 +3577,7 @@ struct lxcDomainAttachDeviceMknodData {
 };
 
 static int
-lxcDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED,
+lxcDomainAttachDeviceMknodHelper(pid_t pid G_GNUC_UNUSED,
                                  void *opaque)
 {
     struct lxcDomainAttachDeviceMknodData *data = opaque;
@@ -3685,7 +3685,7 @@ lxcDomainAttachDeviceMknod(virLXCDriverPtr driver,
 
 
 static int
-lxcDomainAttachDeviceUnlinkHelper(pid_t pid ATTRIBUTE_UNUSED,
+lxcDomainAttachDeviceUnlinkHelper(pid_t pid G_GNUC_UNUSED,
                                   void *opaque)
 {
     const char *path = opaque;

diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c
index 4137d1b04fa5a4cc5ca21af4b842ed15e289c394..b64b275a87cc78aec8b8538d28a5e1de3f946940 100644 (file)
--- a/src/lxc/lxc_fuse.c
+++ b/src/lxc/lxc_fuse.c
@@ -82,8 +82,8 @@ static int lxcProcGetattr(const char *path, struct stat *stbuf)
 
 static int lxcProcReaddir(const char *path, void *buf,
                           fuse_fill_dir_t filler,
-                          off_t offset ATTRIBUTE_UNUSED,
-                          struct fuse_file_info *fi ATTRIBUTE_UNUSED)
+                          off_t offset G_GNUC_UNUSED,
+                          struct fuse_file_info *fi G_GNUC_UNUSED)
 {
     if (STRNEQ(path, "/"))
         return -ENOENT;
@@ -95,8 +95,8 @@ static int lxcProcReaddir(const char *path, void *buf,
     return 0;
 }
 
-static int lxcProcOpen(const char *path ATTRIBUTE_UNUSED,
-                       struct fuse_file_info *fi ATTRIBUTE_UNUSED)
+static int lxcProcOpen(const char *path G_GNUC_UNUSED,
+                       struct fuse_file_info *fi G_GNUC_UNUSED)
 {
     if (STRNEQ(path, fuse_meminfo_path))
         return -ENOENT;
@@ -240,11 +240,11 @@ static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def,
     return res;
 }
 
-static int lxcProcRead(const char *path ATTRIBUTE_UNUSED,
-                       char *buf ATTRIBUTE_UNUSED,
-                       size_t size ATTRIBUTE_UNUSED,
-                       off_t offset ATTRIBUTE_UNUSED,
-                       struct fuse_file_info *fi ATTRIBUTE_UNUSED)
+static int lxcProcRead(const char *path G_GNUC_UNUSED,
+                       char *buf G_GNUC_UNUSED,
+                       size_t size G_GNUC_UNUSED,
+                       off_t offset G_GNUC_UNUSED,
+                       struct fuse_file_info *fi G_GNUC_UNUSED)
 {
     int res = -ENOENT;
     char *hostpath = NULL;
@@ -376,18 +376,18 @@ void lxcFreeFuse(virLXCFusePtr *f)
     }
 }
 #else
-int lxcSetupFuse(virLXCFusePtr *f ATTRIBUTE_UNUSED,
-                  virDomainDefPtr def ATTRIBUTE_UNUSED)
+int lxcSetupFuse(virLXCFusePtr *f G_GNUC_UNUSED,
+                  virDomainDefPtr def G_GNUC_UNUSED)
 {
     return 0;
 }
 
-int lxcStartFuse(virLXCFusePtr f ATTRIBUTE_UNUSED)
+int lxcStartFuse(virLXCFusePtr f G_GNUC_UNUSED)
 {
     return 0;
 }
 
-void lxcFreeFuse(virLXCFusePtr *f ATTRIBUTE_UNUSED)
+void lxcFreeFuse(virLXCFusePtr *f G_GNUC_UNUSED)
 {
 }
 #endif

diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
index 6d3db9629a3810e4f9f33132c3be385d5744882d..4e67e29293a81804e3b2d89129bfb55a3d23cb39 100644 (file)
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -81,8 +81,8 @@ static virNetClientProgramEvent virLXCMonitorEvents[] = {
 
 
 static void
-virLXCMonitorHandleEventExit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
-                             virNetClientPtr client ATTRIBUTE_UNUSED,
+virLXCMonitorHandleEventExit(virNetClientProgramPtr prog G_GNUC_UNUSED,
+                             virNetClientPtr client G_GNUC_UNUSED,
                              void *evdata, void *opaque)
 {
     virLXCMonitorPtr mon = opaque;
@@ -95,8 +95,8 @@ virLXCMonitorHandleEventExit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
 
 
 static void
-virLXCMonitorHandleEventInit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
-                             virNetClientPtr client ATTRIBUTE_UNUSED,
+virLXCMonitorHandleEventInit(virNetClientProgramPtr prog G_GNUC_UNUSED,
+                             virNetClientPtr client G_GNUC_UNUSED,
                              void *evdata, void *opaque)
 {
     virLXCMonitorPtr mon = opaque;
@@ -108,8 +108,8 @@ virLXCMonitorHandleEventInit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
 }
 
 
-static void virLXCMonitorEOFNotify(virNetClientPtr client ATTRIBUTE_UNUSED,
-                                   int reason ATTRIBUTE_UNUSED,
+static void virLXCMonitorEOFNotify(virNetClientPtr client G_GNUC_UNUSED,
+                                   int reason G_GNUC_UNUSED,
                                    void *opaque)
 {
     virLXCMonitorPtr mon = opaque;

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index bf01d517664178878fa180e4cfa1392bcd5d9a66..da0b055b851446fafb1fb0de396d18918d6fec8f 100644 (file)
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -720,7 +720,7 @@ static void virLXCProcessMonitorEOFNotify(virLXCMonitorPtr mon,
     virObjectEventStateQueue(driver->domainEventState, event);
 }
 
-static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED,
+static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon G_GNUC_UNUSED,
                                            virLXCMonitorExitStatus status,
                                            virDomainObjPtr vm)
 {
@@ -779,7 +779,7 @@ virLXCProcessGetNsInode(pid_t pid,
 
 /* XXX a little evil */
 extern virLXCDriverPtr lxc_driver;
-static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED,
+static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon G_GNUC_UNUSED,
                                            pid_t initpid,
                                            virDomainObjPtr vm)
 {