[libvirt] [PATCH] virtlogd: Rename variable shadowing global declaration

Martin Kletzander mkletzan at redhat.com
Fri Nov 27 10:02:04 UTC 2015


This time the winner is variable named 'daemon'.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 src/logging/log_daemon.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index 3fda9ca33c61..cc0559d7ff7b 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 logdmn = opaque;

     if (inhibit)
-        virNetDaemonAddShutdownInhibition(daemon->dmn);
+        virNetDaemonAddShutdownInhibition(logdmn->dmn);
     else
-        virNetDaemonRemoveShutdownInhibition(daemon->dmn);
+        virNetDaemonRemoveShutdownInhibition(logdmn->dmn);
 }

 static virLogDaemonPtr
@@ -177,9 +177,9 @@ virLogDaemonNew(virLogDaemonConfigPtr config, bool privileged)


 virLogHandlerPtr
-virLogDaemonGetHandler(virLogDaemonPtr daemon)
+virLogDaemonGetHandler(virLogDaemonPtr logdmn)
 {
-    return daemon->handler;
+    return logdmn->handler;
 }


-- 
2.6.3




More information about the libvir-list mailing list