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

This time the winner is variable named 'daemon'. Signed-off-by: Martin Kletzander <mkletzan@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

On Fri, Nov 27, 2015 at 11:02:04AM +0100, Martin Kletzander wrote:
This time the winner is variable named 'daemon'.
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/logging/log_daemon.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
I already pushed an equivalent fix for this. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
participants (2)
-
Daniel P. Berrange
-
Martin Kletzander