Re: [libvirt] [PATCH] remove useless code
On Wed, Feb 04, 2009 at 10:24:48PM +0100, Jim Meyering wrote:
diff --git a/src/xm_internal.c b/src/xm_internal.c
index a03263c..c1e9e99 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -2239,8 +2239,6 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn,
diskVal = NULL;
goto no_memory;
}
- diskVal = NULL;
-
if (VIR_ALLOC(netVal) < 0)
goto no_memory;
@@ -2259,7 +2257,6 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn,
netVal = NULL;
goto no_memory;
}
- netVal = NULL;
if (hvm) {
if (def->nparallels) {
These two are not safe to remove. Look at the whole code block in
question:
if (diskVal->list == NULL)
VIR_FREE(diskVal);
else if (virConfSetValue(conf, "disk", diskVal) < 0) {
diskVal = NULL;
goto no_memory;
}
diskVal = NULL;
In the case where virConfSetValue returned >= 0, we need to
still set diskVal = NULL.
Daniel
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|