From 454e50beeecb3a40ee4d71c9ce82d5a006ae0f8a Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Thu, 14 Apr 2011 11:22:35 +0200 Subject: [PATCH] Fix gcc 4.6 warnings gcc 4.6 warns when a variable is initialized but isn't used afterwards: vmware/vmware_driver.c:449:18: warning: variable 'vmxPath' set but not used [-Wunused-but-set-variable] This patch fixes these warnings. There are still 2 offending files: - vbox_tmpl.c: the variable is used inside an #ifdef and is assigned several times outside of #ifdef. Fixing the warning would have required wrapping all the assignment inside #ifdef which hurts readability. vbox/vbox_tmpl.c: In function 'vboxAttachDrives': vbox/vbox_tmpl.c:3918:22: warning: variable 'accessMode' set but not used [-Wunused-but-set-variable] - esx_vi_types.generated.c: the name implies it's generated code and I didn't want to dive into the code generator esx/esx_vi_types.generated.c: In function 'esxVI_FileQueryFlags_Free': esx/esx_vi_types.generated.c:1203:3: warning: variable 'item' set but not used [-Wunused-but-set-variable] --- .mailmap | 1 + AUTHORS | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 7 +++---- src/util/logging.c | 3 +-- src/vmware/vmware_driver.c | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.mailmap b/.mailmap index 88dd435b16..8f37f7800b 100644 --- a/.mailmap +++ b/.mailmap @@ -14,3 +14,4 @@ + diff --git a/AUTHORS b/AUTHORS index 821cd39616..fded3757ab 100644 --- a/AUTHORS +++ b/AUTHORS @@ -156,7 +156,7 @@ Patches have also been contributed by: Zdenek Styblik Gui Jianfeng Michal Novotny - Christophe Fergeau + Christophe Fergeau Markus Groß Phil Petty Taku Izumi diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 6c9c470c41..977f74b3f5 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1634,7 +1634,7 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, bool isIPv6) { int rc; - int directionIn = 0, directionOut = 0; + int directionIn = 0; char chainPrefix[2]; bool maySkipICMP, inout = false; char *matchState = NULL; @@ -1643,9 +1643,8 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter, if ((rule->tt == VIR_NWFILTER_RULE_DIRECTION_IN) || (rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT)) { directionIn = 1; - directionOut = inout = (rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT); - } else - directionOut = 1; + inout = (rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT); + } chainPrefix[0] = 'F'; diff --git a/src/util/logging.c b/src/util/logging.c index 9d187523ce..bb3ba13aa9 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -389,7 +389,7 @@ static void virLogDumpAllFD(const char *msg, int len) { void virLogEmergencyDumpAll(int signum) { int len; - int oldLogStart, oldLogLen, oldLogEnd; + int oldLogStart, oldLogLen; switch (signum) { #ifdef SIGFPE @@ -444,7 +444,6 @@ virLogEmergencyDumpAll(int signum) { * so it's best to reset it first. */ oldLogStart = virLogStart; - oldLogEnd = virLogEnd; oldLogLen = virLogLen; virLogEnd = 0; virLogLen = 0; diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index b5e416be2c..bbfb1a47a2 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -467,7 +467,7 @@ vmwareDomainReboot(virDomainPtr dom, unsigned int flags ATTRIBUTE_UNUSED) } vmwareSetSentinal(cmd, vmw_types[driver->type]); - vmwareSetSentinal(cmd, ((vmwareDomainPtr) vm->privateData)->vmxPath); + vmwareSetSentinal(cmd, vmxPath); if (vm->state != VIR_DOMAIN_RUNNING) { -- GitLab