From: Daniel P. Berrange <berrange@redhat.com>
Date: Fri, 27 Nov 2015 09:26:46 +0000 (+0000)
Subject: logging: avoid variables called 'daemon' due to function clash
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=753346c5dd885caf6fbb3a30e3ec0a43f01516de;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

logging: avoid variables called 'daemon' due to function clash

With some versions of GLibC / GCC, a variable called 'daemon'
will result in a warning about clashing with the function also
named 'daemon'. Rename it to 'dmn' to avoid the clash.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index 3fda9ca33..6da5876c4 100644
--- a/src/logging/log_daemon.c
+++ b/src/logging/log_daemon.c
@@ -127,12 +127,12 @@ virLogDaemonFree(virLogDaemonPtr logd)
 static void
 virLogDaemonInhibitor(bool inhibit, void *opaque)
 {
-    virLogDaemonPtr daemon = opaque;
+    virLogDaemonPtr dmn = opaque;
 
     if (inhibit)
-        virNetDaemonAddShutdownInhibition(daemon->dmn);
+        virNetDaemonAddShutdownInhibition(dmn->dmn);
     else
-        virNetDaemonRemoveShutdownInhibition(daemon->dmn);
+        virNetDaemonRemoveShutdownInhibition(dmn->dmn);
 }
 
 static virLogDaemonPtr
@@ -177,9 +177,9 @@ virLogDaemonNew(virLogDaemonConfigPtr config, bool privileged)
 
 
 virLogHandlerPtr
-virLogDaemonGetHandler(virLogDaemonPtr daemon)
+virLogDaemonGetHandler(virLogDaemonPtr dmn)
 {
-    return daemon->handler;
+    return dmn->handler;
 }
 
 
diff --git a/src/logging/log_daemon.h b/src/logging/log_daemon.h
index b076a4f3b..8d55bb244 100644
--- a/src/logging/log_daemon.h
+++ b/src/logging/log_daemon.h
@@ -40,6 +40,6 @@ struct _virLogDaemonClient {
 
 extern virLogDaemonPtr logDaemon;
 
-virLogHandlerPtr virLogDaemonGetHandler(virLogDaemonPtr daemon);
+virLogHandlerPtr virLogDaemonGetHandler(virLogDaemonPtr dmn);
 
 #endif /* __VIR_LOG_DAEMON_H__ */