External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-01 06:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove useless tests before xmlFree

Browse Source 
* src/qemu_conf.c (qemudParseDiskXML, qemudParseInterfaceXML):
(qemudParseInputXML, qemudParseDhcpRangesXML):
* src/remote_internal.c (doRemoteOpen):
* src/storage_conf.c (virStoragePoolDefParseDoc):
* src/xm_internal.c (xenXMParseXMLDisk, xenXMParseXMLVif):
(xenXMParseXMLToConfig, xenXMAttachInterface):
* src/xml.c (virDomainParseXMLDiskDesc, virDomainParseXMLIfDesc):
(virDomainXMLDevID):
This commit is contained in:
Jim Meyering 2008-04-29 19:43:57 +00:00
parent e9c7af6864
commit 0c37f59802
6 changed files with 57 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Tue Apr 29 21:43:28 CEST 2008 Jim Meyering <meyering@redhat.com>
remove useless tests before xmlFree
* src/qemu_conf.c (qemudParseDiskXML, qemudParseInterfaceXML):
(qemudParseInputXML, qemudParseDhcpRangesXML):
* src/remote_internal.c (doRemoteOpen):
* src/storage_conf.c (virStoragePoolDefParseDoc):
* src/xm_internal.c (xenXMParseXMLDisk, xenXMParseXMLVif):
(xenXMParseXMLToConfig, xenXMAttachInterface):
* src/xml.c (virDomainParseXMLDiskDesc, virDomainParseXMLIfDesc):
(virDomainXMLDevID):
Tue Apr 29 11:36:00 EST 2008 Daniel P. Berrange <berrange@redhat.com> Tue Apr 29 11:36:00 EST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/Makefile.am: Explicitly tell gcov to look in .libs for * src/Makefile.am: Explicitly tell gcov to look in .libs for

16
src/qemu_conf.c
View File

@ -680,13 +680,9 @@ static int qemudParseDiskXML(virConnectPtr conn,
return 0; return 0;
error: error:
if (type)
xmlFree(type); xmlFree(type);
if (target)
xmlFree(target); xmlFree(target);
if (source)
xmlFree(source); xmlFree(source);
if (device)
xmlFree(device); xmlFree(device);
return -1; return -1;
} }
@ -941,17 +937,11 @@ static int qemudParseInterfaceXML(virConnectPtr conn,
return 0; return 0;
error: error:
if (network)
xmlFree(network); xmlFree(network);
if (address)
xmlFree(address); xmlFree(address);
if (port)
xmlFree(port); xmlFree(port);
if (ifname)
xmlFree(ifname); xmlFree(ifname);
if (script)
xmlFree(script); xmlFree(script);
if (bridge)
xmlFree(bridge); xmlFree(bridge);
return -1; return -1;
} }
@ -1334,17 +1324,13 @@ static int qemudParseInputXML(virConnectPtr conn,
input->bus = QEMU_INPUT_BUS_USB; input->bus = QEMU_INPUT_BUS_USB;
} }
if (type)
xmlFree(type); xmlFree(type);
if (bus)
xmlFree(bus); xmlFree(bus);
return 0; return 0;
error: error:
if (type)
xmlFree(type); xmlFree(type);
if (bus)
xmlFree(bus); xmlFree(bus);
return -1; return -1;
@ -2860,9 +2846,7 @@ static int qemudParseDhcpRangesXML(virConnectPtr conn,
free(range); free(range);
} }
if (start)
xmlFree(start); xmlFree(start);
if (end)
xmlFree(end); xmlFree(end);
cur = cur->next; cur = cur->next;

8
src/remote_internal.c
View File

@ -434,9 +434,9 @@ doRemoteOpen (virConnectPtr conn,
} }
#ifdef HAVE_XMLURI_QUERY_RAW #ifdef HAVE_XMLURI_QUERY_RAW
if (uri->query_raw) xmlFree (uri->query_raw); xmlFree (uri->query_raw);
#else #else
if (uri->query) xmlFree (uri->query); xmlFree (uri->query);
#endif #endif
if (( if ((
@ -464,10 +464,10 @@ doRemoteOpen (virConnectPtr conn,
transport_str[-1] = '\0'; transport_str[-1] = '\0';
} }
/* Remove the username, server name and port number. */ /* Remove the username, server name and port number. */
if (uri->user) xmlFree (uri->user); xmlFree (uri->user);
uri->user = 0; uri->user = 0;
if (uri->server) xmlFree (uri->server); xmlFree (uri->server);
uri->server = 0; uri->server = 0;
uri->port = 0; uri->port = 0;

1
src/storage_conf.c
View File

@ -357,7 +357,6 @@ virStoragePoolDefParseDoc(virConnectPtr conn,
cleanup: cleanup:
free(uuid); free(uuid);
if (type)
xmlFree(type); xmlFree(type);
virStoragePoolDefFree(ret); virStoragePoolDefFree(ret);
return NULL; return NULL;

14
src/xm_internal.c
View File

@ -1657,9 +1657,7 @@ static int xenXMParseXMLDisk(xmlNodePtr node, int hvm, int xendConfigVersion, ch
} }
if (target == NULL) { if (target == NULL) {
if (source != NULL)
xmlFree(source); xmlFree(source);
if (device != NULL)
xmlFree(device); xmlFree(device);
return (-1); return (-1);
} }
@ -1687,9 +1685,7 @@ static int xenXMParseXMLDisk(xmlNodePtr node, int hvm, int xendConfigVersion, ch
} }
if (source == NULL && !cdrom) { if (source == NULL && !cdrom) {
if (target != NULL)
xmlFree(target); xmlFree(target);
if (device != NULL)
xmlFree(device); xmlFree(device);
return (-1); return (-1);
} }
@ -1765,7 +1761,6 @@ static int xenXMParseXMLDisk(xmlNodePtr node, int hvm, int xendConfigVersion, ch
xmlFree(drvName); xmlFree(drvName);
xmlFree(device); xmlFree(device);
xmlFree(target); xmlFree(target);
if(source)
xmlFree(source); xmlFree(source);
*disk = buf; *disk = buf;
@ -1877,13 +1872,9 @@ static char *xenXMParseXMLVif(virConnectPtr conn, xmlNodePtr node, int hvm) {
cleanup: cleanup:
free(bridge); free(bridge);
if (mac != NULL)
xmlFree(mac); xmlFree(mac);
if (source != NULL)
xmlFree(source); xmlFree(source);
if (script != NULL)
xmlFree(script); xmlFree(script);
if (ip != NULL)
xmlFree(ip); xmlFree(ip);
return buf; return buf;
@ -2164,7 +2155,6 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) {
strcat(val, ",vncdisplay="); strcat(val, ",vncdisplay=");
strcat(val, portstr); strcat(val, portstr);
} }
if (vncport)
xmlFree(vncport); xmlFree(vncport);
if (vnclisten) { if (vnclisten) {
strcat(val, ",vnclisten="); strcat(val, ",vnclisten=");
@ -2310,7 +2300,6 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) {
error: error:
if (conf) if (conf)
virConfFree(conf); virConfFree(conf);
if (prop != NULL)
xmlFree(prop); xmlFree(prop);
xmlXPathFreeObject(obj); xmlXPathFreeObject(obj);
xmlXPathFreeContext(ctxt); xmlXPathFreeContext(ctxt);
@ -2960,11 +2949,8 @@ xenXMAttachInterface(virDomainPtr domain, xmlXPathContextPtr ctxt, int hvm,
goto cleanup; goto cleanup;
node_cleanup: node_cleanup:
if (node_tmp)
xmlFree(node_tmp); xmlFree(node_tmp);
if (attr_node)
xmlFree(attr_node); xmlFree(attr_node);
if (text_node)
xmlFree(text_node); xmlFree(text_node);
cleanup: cleanup:
free(type); free(type);

10
src/xml.c
View File

@ -1341,15 +1341,10 @@ virDomainParseXMLDiskDesc(virConnectPtr conn, xmlNodePtr node,
virBufferAddLit(buf, ")"); virBufferAddLit(buf, ")");
cleanup: cleanup:
if (drvType)
xmlFree(drvType); xmlFree(drvType);
if (drvName)
xmlFree(drvName); xmlFree(drvName);
if (device)
xmlFree(device); xmlFree(device);
if (target)
xmlFree(target); xmlFree(target);
if (source)
xmlFree(source); xmlFree(source);
return (ret); return (ret);
} }
@ -1466,13 +1461,9 @@ virDomainParseXMLIfDesc(virConnectPtr conn ATTRIBUTE_UNUSED,
virBufferAddLit(buf, ")"); virBufferAddLit(buf, ")");
ret = 0; ret = 0;
error: error:
if (mac != NULL)
xmlFree(mac); xmlFree(mac);
if (source != NULL)
xmlFree(source); xmlFree(source);
if (script != NULL)
xmlFree(script); xmlFree(script);
if (ip != NULL)
xmlFree(ip); xmlFree(ip);
return (ret); return (ret);
} }
@ -1953,7 +1944,6 @@ virDomainXMLDevID(virDomainPtr domain, const char *xmldesc, char *class,
cleanup: cleanup:
if (xml != NULL) if (xml != NULL)
xmlFreeDoc(xml); xmlFreeDoc(xml);
if (attr != NULL)
xmlFree(attr); xmlFree(attr);
return ret; return ret;
} }