External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-30 11:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix gcc 4.6 warnings

Browse Source 
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]
This commit is contained in:
Christophe Fergeau 2011-04-14 11:22:35 +02:00 committed by Matthias Bolte
parent 2ac455c4d2
commit 454e50beee
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -14,3 +14,4 @@
<jclift@redhat.com> <justin@salasaga.org> <jclift@redhat.com> <justin@salasaga.org>
<berrange@redhat.com> <dan@berrange.com> <berrange@redhat.com> <dan@berrange.com>
<soren@linux2go.dk> <soren@canonical.com> <soren@linux2go.dk> <soren@canonical.com>
<cfergeau@redhat.com> <teuf@gnome.org>

2
AUTHORS
View File

@ -156,7 +156,7 @@ Patches have also been contributed by:
Zdenek Styblik <stybla@turnovfree.net> Zdenek Styblik <stybla@turnovfree.net>
Gui Jianfeng <guijianfeng@cn.fujitsu.com> Gui Jianfeng <guijianfeng@cn.fujitsu.com>
Michal Novotny <minovotn@redhat.com> Michal Novotny <minovotn@redhat.com>
Christophe Fergeau <teuf@gnome.org> Christophe Fergeau <cfergeau@redhat.com>
Markus Groß <gross@univention.de> Markus Groß <gross@univention.de>
Phil Petty <phpetty@cisco.com> Phil Petty <phpetty@cisco.com>
Taku Izumi <izumi.taku@jp.fujitsu.com> Taku Izumi <izumi.taku@jp.fujitsu.com>

7
src/nwfilter/nwfilter_ebiptables_driver.c
View File

@ -1634,7 +1634,7 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter,
bool isIPv6) bool isIPv6)
{ {
int rc; int rc;
int directionIn = 0, directionOut = 0; int directionIn = 0;
char chainPrefix[2]; char chainPrefix[2];
bool maySkipICMP, inout = false; bool maySkipICMP, inout = false;
char *matchState = NULL; char *matchState = NULL;
@ -1643,9 +1643,8 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter,
if ((rule->tt == VIR_NWFILTER_RULE_DIRECTION_IN) || if ((rule->tt == VIR_NWFILTER_RULE_DIRECTION_IN) ||
(rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT)) { (rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT)) {
directionIn = 1; directionIn = 1;
directionOut = inout = (rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT); inout = (rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT);
} else }
directionOut = 1;
chainPrefix[0] = 'F'; chainPrefix[0] = 'F';

3
src/util/logging.c
View File

@ -389,7 +389,7 @@ static void virLogDumpAllFD(const char *msg, int len) {
void void
virLogEmergencyDumpAll(int signum) { virLogEmergencyDumpAll(int signum) {
int len; int len;
int oldLogStart, oldLogLen, oldLogEnd; int oldLogStart, oldLogLen;
switch (signum) { switch (signum) {
#ifdef SIGFPE #ifdef SIGFPE
@ -444,7 +444,6 @@ virLogEmergencyDumpAll(int signum) {
* so it's best to reset it first. * so it's best to reset it first.
*/ */
oldLogStart = virLogStart; oldLogStart = virLogStart;
oldLogEnd = virLogEnd;
oldLogLen = virLogLen; oldLogLen = virLogLen;
virLogEnd = 0; virLogEnd = 0;
virLogLen = 0; virLogLen = 0;

2
src/vmware/vmware_driver.c
View File

@ -467,7 +467,7 @@ vmwareDomainReboot(virDomainPtr dom, unsigned int flags ATTRIBUTE_UNUSED)
} }
vmwareSetSentinal(cmd, vmw_types[driver->type]); vmwareSetSentinal(cmd, vmw_types[driver->type]);
vmwareSetSentinal(cmd, ((vmwareDomainPtr) vm->privateData)->vmxPath); vmwareSetSentinal(cmd, vmxPath);
if (vm->state != VIR_DOMAIN_RUNNING) { if (vm->state != VIR_DOMAIN_RUNNING) {