mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-20 21:19:19 +00:00
Use g_auto for xmlFreeDoc everywhere
Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Martin Kletzander <mkletzan@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
parent
5dae71ee8c
commit
2c426d2e30
@ -213,7 +213,7 @@ virDomainCheckpointDefParseString(const char *xmlStr,
|
|||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
virDomainCheckpointDef *ret = NULL;
|
virDomainCheckpointDef *ret = NULL;
|
||||||
xmlDocPtr xml;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
int keepBlanksDefault = xmlKeepBlanksDefault(0);
|
int keepBlanksDefault = xmlKeepBlanksDefault(0);
|
||||||
|
|
||||||
if ((xml = virXMLParse(NULL, xmlStr, _("(domain_checkpoint)"),
|
if ((xml = virXMLParse(NULL, xmlStr, _("(domain_checkpoint)"),
|
||||||
@ -221,7 +221,6 @@ virDomainCheckpointDefParseString(const char *xmlStr,
|
|||||||
xmlKeepBlanksDefault(keepBlanksDefault);
|
xmlKeepBlanksDefault(keepBlanksDefault);
|
||||||
ret = virDomainCheckpointDefParseNode(xml, xmlDocGetRootElement(xml),
|
ret = virDomainCheckpointDefParseNode(xml, xmlDocGetRootElement(xml),
|
||||||
xmlopt, parseOpaque, flags);
|
xmlopt, parseOpaque, flags);
|
||||||
xmlFreeDoc(xml);
|
|
||||||
}
|
}
|
||||||
xmlKeepBlanksDefault(keepBlanksDefault);
|
xmlKeepBlanksDefault(keepBlanksDefault);
|
||||||
|
|
||||||
|
@ -281,7 +281,7 @@ virCPUDefParseXMLString(const char *xml,
|
|||||||
virCPUDef **cpu,
|
virCPUDef **cpu,
|
||||||
bool validateXML)
|
bool validateXML)
|
||||||
{
|
{
|
||||||
xmlDocPtr doc = NULL;
|
g_autoptr(xmlDoc) doc = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
|
|
||||||
@ -299,7 +299,6 @@ virCPUDefParseXMLString(const char *xml,
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
xmlFreeDoc(doc);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20377,7 +20377,7 @@ virDomainDefParse(const char *xmlStr,
|
|||||||
void *parseOpaque,
|
void *parseOpaque,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
xmlDocPtr xml = NULL;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
virDomainDef *def = NULL;
|
virDomainDef *def = NULL;
|
||||||
int keepBlanksDefault = xmlKeepBlanksDefault(0);
|
int keepBlanksDefault = xmlKeepBlanksDefault(0);
|
||||||
xmlNodePtr root;
|
xmlNodePtr root;
|
||||||
@ -20397,7 +20397,6 @@ virDomainDefParse(const char *xmlStr,
|
|||||||
def = virDomainDefParseNode(xml, root, xmlopt, parseOpaque, flags);
|
def = virDomainDefParseNode(xml, root, xmlopt, parseOpaque, flags);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
xmlFreeDoc(xml);
|
|
||||||
xmlKeepBlanksDefault(keepBlanksDefault);
|
xmlKeepBlanksDefault(keepBlanksDefault);
|
||||||
return def;
|
return def;
|
||||||
}
|
}
|
||||||
@ -20480,14 +20479,13 @@ virDomainObjParseFile(const char *filename,
|
|||||||
virDomainXMLOption *xmlopt,
|
virDomainXMLOption *xmlopt,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
xmlDocPtr xml;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
virDomainObj *obj = NULL;
|
virDomainObj *obj = NULL;
|
||||||
int keepBlanksDefault = xmlKeepBlanksDefault(0);
|
int keepBlanksDefault = xmlKeepBlanksDefault(0);
|
||||||
|
|
||||||
if ((xml = virXMLParseFile(filename))) {
|
if ((xml = virXMLParseFile(filename))) {
|
||||||
obj = virDomainObjParseNode(xml, xmlDocGetRootElement(xml),
|
obj = virDomainObjParseNode(xml, xmlDocGetRootElement(xml),
|
||||||
xmlopt, flags);
|
xmlopt, flags);
|
||||||
xmlFreeDoc(xml);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
xmlKeepBlanksDefault(keepBlanksDefault);
|
xmlKeepBlanksDefault(keepBlanksDefault);
|
||||||
|
@ -821,12 +821,11 @@ static virInterfaceDef *
|
|||||||
virInterfaceDefParse(const char *xmlStr,
|
virInterfaceDefParse(const char *xmlStr,
|
||||||
const char *filename)
|
const char *filename)
|
||||||
{
|
{
|
||||||
xmlDocPtr xml;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
virInterfaceDef *def = NULL;
|
virInterfaceDef *def = NULL;
|
||||||
|
|
||||||
if ((xml = virXMLParse(filename, xmlStr, _("(interface_definition)"), NULL, false))) {
|
if ((xml = virXMLParse(filename, xmlStr, _("(interface_definition)"), NULL, false))) {
|
||||||
def = virInterfaceDefParseNode(xml, xmlDocGetRootElement(xml));
|
def = virInterfaceDefParseNode(xml, xmlDocGetRootElement(xml));
|
||||||
xmlFreeDoc(xml);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return def;
|
return def;
|
||||||
|
@ -2174,13 +2174,12 @@ virNodeDeviceDefParse(const char *str,
|
|||||||
virNodeDeviceDefParserCallbacks *parserCallbacks,
|
virNodeDeviceDefParserCallbacks *parserCallbacks,
|
||||||
void *opaque)
|
void *opaque)
|
||||||
{
|
{
|
||||||
xmlDocPtr xml;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
g_autoptr(virNodeDeviceDef) def = NULL;
|
g_autoptr(virNodeDeviceDef) def = NULL;
|
||||||
|
|
||||||
if ((xml = virXMLParse(filename, str, _("(node_device_definition)"), NULL, false))) {
|
if ((xml = virXMLParse(filename, str, _("(node_device_definition)"), NULL, false))) {
|
||||||
def = virNodeDeviceDefParseNode(xml, xmlDocGetRootElement(xml),
|
def = virNodeDeviceDefParseNode(xml, xmlDocGetRootElement(xml),
|
||||||
create, virt_type);
|
create, virt_type);
|
||||||
xmlFreeDoc(xml);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (parserCallbacks) {
|
if (parserCallbacks) {
|
||||||
|
@ -2742,11 +2742,10 @@ virNWFilterDefParse(const char *xmlStr,
|
|||||||
const char *filename)
|
const char *filename)
|
||||||
{
|
{
|
||||||
virNWFilterDef *def = NULL;
|
virNWFilterDef *def = NULL;
|
||||||
xmlDocPtr xml;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
|
|
||||||
if ((xml = virXMLParse(filename, xmlStr, _("(nwfilter_definition)"), NULL, false))) {
|
if ((xml = virXMLParse(filename, xmlStr, _("(nwfilter_definition)"), NULL, false))) {
|
||||||
def = virNWFilterDefParseNode(xml, xmlDocGetRootElement(xml));
|
def = virNWFilterDefParseNode(xml, xmlDocGetRootElement(xml));
|
||||||
xmlFreeDoc(xml);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return def;
|
return def;
|
||||||
|
@ -193,12 +193,11 @@ static virSecretDef *
|
|||||||
virSecretDefParse(const char *xmlStr,
|
virSecretDefParse(const char *xmlStr,
|
||||||
const char *filename)
|
const char *filename)
|
||||||
{
|
{
|
||||||
xmlDocPtr xml;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
virSecretDef *ret = NULL;
|
virSecretDef *ret = NULL;
|
||||||
|
|
||||||
if ((xml = virXMLParse(filename, xmlStr, _("(definition_of_secret)"), NULL, false))) {
|
if ((xml = virXMLParse(filename, xmlStr, _("(definition_of_secret)"), NULL, false))) {
|
||||||
ret = secretXMLParseNode(xml, xmlDocGetRootElement(xml));
|
ret = secretXMLParseNode(xml, xmlDocGetRootElement(xml));
|
||||||
xmlFreeDoc(xml);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -447,7 +447,7 @@ virDomainSnapshotDefParseString(const char *xmlStr,
|
|||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
virDomainSnapshotDef *ret = NULL;
|
virDomainSnapshotDef *ret = NULL;
|
||||||
xmlDocPtr xml;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
int keepBlanksDefault = xmlKeepBlanksDefault(0);
|
int keepBlanksDefault = xmlKeepBlanksDefault(0);
|
||||||
|
|
||||||
if ((xml = virXMLParse(NULL, xmlStr, _("(domain_snapshot)"), "domainsnapshot.rng",
|
if ((xml = virXMLParse(NULL, xmlStr, _("(domain_snapshot)"), "domainsnapshot.rng",
|
||||||
@ -456,7 +456,6 @@ virDomainSnapshotDefParseString(const char *xmlStr,
|
|||||||
ret = virDomainSnapshotDefParseNode(xml, xmlDocGetRootElement(xml),
|
ret = virDomainSnapshotDefParseNode(xml, xmlDocGetRootElement(xml),
|
||||||
xmlopt, parseOpaque,
|
xmlopt, parseOpaque,
|
||||||
current, flags);
|
current, flags);
|
||||||
xmlFreeDoc(xml);
|
|
||||||
}
|
}
|
||||||
xmlKeepBlanksDefault(keepBlanksDefault);
|
xmlKeepBlanksDefault(keepBlanksDefault);
|
||||||
|
|
||||||
|
@ -1007,11 +1007,10 @@ virStoragePoolDefParse(const char *xmlStr,
|
|||||||
const char *filename)
|
const char *filename)
|
||||||
{
|
{
|
||||||
virStoragePoolDef *ret = NULL;
|
virStoragePoolDef *ret = NULL;
|
||||||
xmlDocPtr xml;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
|
|
||||||
if ((xml = virXMLParse(filename, xmlStr, _("(storage_pool_definition)"), NULL, false))) {
|
if ((xml = virXMLParse(filename, xmlStr, _("(storage_pool_definition)"), NULL, false))) {
|
||||||
ret = virStoragePoolDefParseNode(xml, xmlDocGetRootElement(xml));
|
ret = virStoragePoolDefParseNode(xml, xmlDocGetRootElement(xml));
|
||||||
xmlFreeDoc(xml);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
@ -1476,11 +1475,10 @@ virStorageVolDefParse(virStoragePoolDef *pool,
|
|||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
virStorageVolDef *ret = NULL;
|
virStorageVolDef *ret = NULL;
|
||||||
xmlDocPtr xml;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
|
|
||||||
if ((xml = virXMLParse(filename, xmlStr, _("(storage_volume_definition)"), NULL, false))) {
|
if ((xml = virXMLParse(filename, xmlStr, _("(storage_volume_definition)"), NULL, false))) {
|
||||||
ret = virStorageVolDefParseNode(pool, xml, xmlDocGetRootElement(xml), flags);
|
ret = virStorageVolDefParseNode(pool, xml, xmlDocGetRootElement(xml), flags);
|
||||||
xmlFreeDoc(xml);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -294,11 +294,10 @@ virNetworkPortDefParse(const char *xmlStr,
|
|||||||
const char *filename)
|
const char *filename)
|
||||||
{
|
{
|
||||||
virNetworkPortDef *def = NULL;
|
virNetworkPortDef *def = NULL;
|
||||||
xmlDocPtr xml;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
|
|
||||||
if ((xml = virXMLParse(filename, xmlStr, _("(networkport_definition)"), NULL, false))) {
|
if ((xml = virXMLParse(filename, xmlStr, _("(networkport_definition)"), NULL, false))) {
|
||||||
def = virNetworkPortDefParseNode(xml, xmlDocGetRootElement(xml));
|
def = virNetworkPortDefParseNode(xml, xmlDocGetRootElement(xml));
|
||||||
xmlFreeDoc(xml);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return def;
|
return def;
|
||||||
|
@ -185,11 +185,10 @@ virNWFilterBindingDefParse(const char *xmlStr,
|
|||||||
const char *filename)
|
const char *filename)
|
||||||
{
|
{
|
||||||
virNWFilterBindingDef *def = NULL;
|
virNWFilterBindingDef *def = NULL;
|
||||||
xmlDocPtr xml;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
|
|
||||||
if ((xml = virXMLParse(filename, xmlStr, _("(nwfilterbinding_definition)"), NULL, false))) {
|
if ((xml = virXMLParse(filename, xmlStr, _("(nwfilterbinding_definition)"), NULL, false))) {
|
||||||
def = virNWFilterBindingDefParseNode(xml, xmlDocGetRootElement(xml));
|
def = virNWFilterBindingDefParseNode(xml, xmlDocGetRootElement(xml));
|
||||||
xmlFreeDoc(xml);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return def;
|
return def;
|
||||||
|
@ -262,11 +262,10 @@ virNWFilterBindingObjParse(const char *xmlStr,
|
|||||||
const char *filename)
|
const char *filename)
|
||||||
{
|
{
|
||||||
virNWFilterBindingObj *obj = NULL;
|
virNWFilterBindingObj *obj = NULL;
|
||||||
xmlDocPtr xml;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
|
|
||||||
if ((xml = virXMLParse(filename, xmlStr, _("(nwfilterbinding_status)"), NULL, false))) {
|
if ((xml = virXMLParse(filename, xmlStr, _("(nwfilterbinding_status)"), NULL, false))) {
|
||||||
obj = virNWFilterBindingObjParseNode(xml, xmlDocGetRootElement(xml));
|
obj = virNWFilterBindingObjParseNode(xml, xmlDocGetRootElement(xml));
|
||||||
xmlFreeDoc(xml);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
|
@ -79,7 +79,7 @@ virSaveCookieParseString(const char *xml,
|
|||||||
virObject **obj,
|
virObject **obj,
|
||||||
virSaveCookieCallbacks *saveCookie)
|
virSaveCookieCallbacks *saveCookie)
|
||||||
{
|
{
|
||||||
xmlDocPtr doc = NULL;
|
g_autoptr(xmlDoc) doc = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
|
|
||||||
@ -96,7 +96,6 @@ virSaveCookieParseString(const char *xml,
|
|||||||
ret = virSaveCookieParseNode(ctxt, obj, saveCookie);
|
ret = virSaveCookieParseNode(ctxt, obj, saveCookie);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
xmlFreeDoc(doc);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1643,7 +1643,7 @@ virStoragePoolObjLoadState(virStoragePoolObjList *pools,
|
|||||||
{
|
{
|
||||||
char *stateFile = NULL;
|
char *stateFile = NULL;
|
||||||
virStoragePoolObj *obj = NULL;
|
virStoragePoolObj *obj = NULL;
|
||||||
xmlDocPtr xml = NULL;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||||
xmlNodePtr node = NULL;
|
xmlNodePtr node = NULL;
|
||||||
g_autoptr(virStoragePoolDef) def = NULL;
|
g_autoptr(virStoragePoolDef) def = NULL;
|
||||||
@ -1687,7 +1687,6 @@ virStoragePoolObjLoadState(virStoragePoolObjList *pools,
|
|||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
VIR_FREE(stateFile);
|
VIR_FREE(stateFile);
|
||||||
xmlFreeDoc(xml);
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -148,7 +148,7 @@ libxlMigrationEatCookie(const char *cookiein,
|
|||||||
libxlMigrationCookie **migout)
|
libxlMigrationCookie **migout)
|
||||||
{
|
{
|
||||||
libxlMigrationCookie *mig = NULL;
|
libxlMigrationCookie *mig = NULL;
|
||||||
xmlDocPtr doc = NULL;
|
g_autoptr(xmlDoc) doc = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||||
g_autofree char *uuidstr = NULL;
|
g_autofree char *uuidstr = NULL;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
@ -216,7 +216,6 @@ libxlMigrationEatCookie(const char *cookiein,
|
|||||||
libxlMigrationCookieFree(mig);
|
libxlMigrationCookieFree(mig);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
xmlFreeDoc(doc);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4191,7 +4191,7 @@ virQEMUCapsLoadCache(virArch hostArch,
|
|||||||
const char *filename,
|
const char *filename,
|
||||||
bool skipInvalidation)
|
bool skipInvalidation)
|
||||||
{
|
{
|
||||||
xmlDocPtr doc = NULL;
|
g_autoptr(xmlDoc) doc = NULL;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
size_t i;
|
size_t i;
|
||||||
int n;
|
int n;
|
||||||
@ -4421,7 +4421,6 @@ virQEMUCapsLoadCache(virArch hostArch,
|
|||||||
cleanup:
|
cleanup:
|
||||||
VIR_FREE(str);
|
VIR_FREE(str);
|
||||||
VIR_FREE(nodes);
|
VIR_FREE(nodes);
|
||||||
xmlFreeDoc(doc);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1431,7 +1431,7 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookie *mig,
|
|||||||
const char *xml,
|
const char *xml,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
xmlDocPtr doc = NULL;
|
g_autoptr(xmlDoc) doc = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
|
|
||||||
@ -1443,7 +1443,6 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookie *mig,
|
|||||||
ret = qemuMigrationCookieXMLParse(mig, driver, qemuCaps, doc, ctxt, flags);
|
ret = qemuMigrationCookieXMLParse(mig, driver, qemuCaps, doc, ctxt, flags);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
xmlFreeDoc(doc);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -568,7 +568,7 @@ static int
|
|||||||
caps_mockup(vahControl * ctl, const char *xmlStr)
|
caps_mockup(vahControl * ctl, const char *xmlStr)
|
||||||
{
|
{
|
||||||
int rc = -1;
|
int rc = -1;
|
||||||
xmlDocPtr xml = NULL;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||||
char *arch;
|
char *arch;
|
||||||
|
|
||||||
@ -607,7 +607,6 @@ caps_mockup(vahControl * ctl, const char *xmlStr)
|
|||||||
rc = 0;
|
rc = 0;
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
xmlFreeDoc(xml);
|
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
@ -2892,7 +2892,7 @@ virStorageUtilGlusterExtractPoolSources(const char *host,
|
|||||||
virStoragePoolSourceList *list,
|
virStoragePoolSourceList *list,
|
||||||
virStoragePoolType pooltype)
|
virStoragePoolType pooltype)
|
||||||
{
|
{
|
||||||
xmlDocPtr doc = NULL;
|
g_autoptr(xmlDoc) doc = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||||
virStoragePoolSource *src = NULL;
|
virStoragePoolSource *src = NULL;
|
||||||
size_t i;
|
size_t i;
|
||||||
@ -2940,7 +2940,6 @@ virStorageUtilGlusterExtractPoolSources(const char *host,
|
|||||||
ret = nnodes;
|
ret = nnodes;
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
xmlFreeDoc(doc);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -825,7 +825,7 @@ static xmlNodePtr
|
|||||||
testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *type)
|
testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *type)
|
||||||
{
|
{
|
||||||
xmlNodePtr ret = NULL;
|
xmlNodePtr ret = NULL;
|
||||||
xmlDocPtr doc = NULL;
|
g_autoptr(xmlDoc) doc = NULL;
|
||||||
g_autofree char *absFile = NULL;
|
g_autofree char *absFile = NULL;
|
||||||
g_autofree char *relFile = NULL;
|
g_autofree char *relFile = NULL;
|
||||||
|
|
||||||
@ -848,7 +848,6 @@ testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *type)
|
|||||||
}
|
}
|
||||||
|
|
||||||
error:
|
error:
|
||||||
xmlFreeDoc(doc);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1333,7 +1332,7 @@ testOpenParse(testDriver *privconn,
|
|||||||
static int
|
static int
|
||||||
testOpenFromFile(virConnectPtr conn, const char *file)
|
testOpenFromFile(virConnectPtr conn, const char *file)
|
||||||
{
|
{
|
||||||
xmlDocPtr doc = NULL;
|
g_autoptr(xmlDoc) doc = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||||
testDriver *privconn;
|
testDriver *privconn;
|
||||||
|
|
||||||
@ -1355,13 +1354,11 @@ testOpenFromFile(virConnectPtr conn, const char *file)
|
|||||||
if (testOpenParse(privconn, file, ctxt) < 0)
|
if (testOpenParse(privconn, file, ctxt) < 0)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
xmlFreeDoc(doc);
|
|
||||||
virObjectUnlock(privconn);
|
virObjectUnlock(privconn);
|
||||||
|
|
||||||
return VIR_DRV_OPEN_SUCCESS;
|
return VIR_DRV_OPEN_SUCCESS;
|
||||||
|
|
||||||
error:
|
error:
|
||||||
xmlFreeDoc(doc);
|
|
||||||
virObjectUnref(privconn);
|
virObjectUnref(privconn);
|
||||||
conn->privateData = NULL;
|
conn->privateData = NULL;
|
||||||
return VIR_DRV_OPEN_ERROR;
|
return VIR_DRV_OPEN_ERROR;
|
||||||
@ -1375,7 +1372,7 @@ testOpenDefault(virConnectPtr conn)
|
|||||||
{
|
{
|
||||||
int ret = VIR_DRV_OPEN_ERROR;
|
int ret = VIR_DRV_OPEN_ERROR;
|
||||||
testDriver *privconn = NULL;
|
testDriver *privconn = NULL;
|
||||||
xmlDocPtr doc = NULL;
|
g_autoptr(xmlDoc) doc = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
@ -1424,7 +1421,6 @@ testOpenDefault(virConnectPtr conn)
|
|||||||
ret = VIR_DRV_OPEN_SUCCESS;
|
ret = VIR_DRV_OPEN_SUCCESS;
|
||||||
cleanup:
|
cleanup:
|
||||||
virMutexUnlock(&defaultLock);
|
virMutexUnlock(&defaultLock);
|
||||||
xmlFreeDoc(doc);
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
error:
|
error:
|
||||||
|
@ -1619,12 +1619,11 @@ int
|
|||||||
virXMLValidateNodeAgainstSchema(const char *schemafile, xmlNodePtr node)
|
virXMLValidateNodeAgainstSchema(const char *schemafile, xmlNodePtr node)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
xmlDocPtr copy = xmlNewDoc(NULL);
|
g_autoptr(xmlDoc) copy = xmlNewDoc(NULL);
|
||||||
|
|
||||||
xmlDocSetRootElement(copy, xmlCopyNode(node, true));
|
xmlDocSetRootElement(copy, xmlCopyNode(node, true));
|
||||||
ret = virXMLValidateAgainstSchema(schemafile, copy);
|
ret = virXMLValidateAgainstSchema(schemafile, copy);
|
||||||
|
|
||||||
xmlFreeDoc(copy);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -575,7 +575,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath,
|
|||||||
{
|
{
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
virVBoxSnapshotConfMachine *machineDescription = NULL;
|
virVBoxSnapshotConfMachine *machineDescription = NULL;
|
||||||
xmlDocPtr xml = NULL;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
xmlNodePtr machineNode = NULL;
|
xmlNodePtr machineNode = NULL;
|
||||||
xmlNodePtr cur = NULL;
|
xmlNodePtr cur = NULL;
|
||||||
g_autoptr(xmlXPathContext) xPathContext = NULL;
|
g_autoptr(xmlXPathContext) xPathContext = NULL;
|
||||||
@ -716,7 +716,6 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath,
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
xmlFreeDoc(xml);
|
|
||||||
|
|
||||||
VIR_FREE(currentStateModifiedString);
|
VIR_FREE(currentStateModifiedString);
|
||||||
VIR_FREE(currentSnapshotAttribute);
|
VIR_FREE(currentSnapshotAttribute);
|
||||||
@ -954,7 +953,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMachine *machine,
|
|||||||
{
|
{
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
size_t i = 0;
|
size_t i = 0;
|
||||||
xmlDocPtr xml = NULL;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
xmlNodePtr mediaRegistryNode = NULL;
|
xmlNodePtr mediaRegistryNode = NULL;
|
||||||
xmlNodePtr snapshotNode = NULL;
|
xmlNodePtr snapshotNode = NULL;
|
||||||
xmlNodePtr machineNode = NULL;
|
xmlNodePtr machineNode = NULL;
|
||||||
@ -1172,7 +1171,6 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMachine *machine,
|
|||||||
xmlUnlinkNode(machineNode);
|
xmlUnlinkNode(machineNode);
|
||||||
xmlFreeNode(machineNode);
|
xmlFreeNode(machineNode);
|
||||||
|
|
||||||
xmlFreeDoc(xml);
|
|
||||||
|
|
||||||
g_strfreev(firstRegex);
|
g_strfreev(firstRegex);
|
||||||
g_strfreev(secondRegex);
|
g_strfreev(secondRegex);
|
||||||
@ -1219,7 +1217,7 @@ virVBoxSnapshotConfGetRWDisksPathsFromLibvirtXML(const char *filePath,
|
|||||||
int result = -1;
|
int result = -1;
|
||||||
size_t i = 0;
|
size_t i = 0;
|
||||||
char **ret = NULL;
|
char **ret = NULL;
|
||||||
xmlDocPtr xml = NULL;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
g_autoptr(xmlXPathContext) xPathContext = NULL;
|
g_autoptr(xmlXPathContext) xPathContext = NULL;
|
||||||
xmlNodePtr *nodes = NULL;
|
xmlNodePtr *nodes = NULL;
|
||||||
int nodeSize = 0;
|
int nodeSize = 0;
|
||||||
@ -1258,7 +1256,6 @@ virVBoxSnapshotConfGetRWDisksPathsFromLibvirtXML(const char *filePath,
|
|||||||
result = 0;
|
result = 0;
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
xmlFreeDoc(xml);
|
|
||||||
if (result < 0) {
|
if (result < 0) {
|
||||||
g_strfreev(ret);
|
g_strfreev(ret);
|
||||||
nodeSize = -1;
|
nodeSize = -1;
|
||||||
@ -1281,7 +1278,7 @@ virVBoxSnapshotConfGetRODisksPathsFromLibvirtXML(const char *filePath,
|
|||||||
int result = -1;
|
int result = -1;
|
||||||
size_t i = 0;
|
size_t i = 0;
|
||||||
char **ret = NULL;
|
char **ret = NULL;
|
||||||
xmlDocPtr xml = NULL;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
g_autoptr(xmlXPathContext) xPathContext = NULL;
|
g_autoptr(xmlXPathContext) xPathContext = NULL;
|
||||||
xmlNodePtr *nodes = NULL;
|
xmlNodePtr *nodes = NULL;
|
||||||
int nodeSize = 0;
|
int nodeSize = 0;
|
||||||
@ -1319,7 +1316,6 @@ virVBoxSnapshotConfGetRODisksPathsFromLibvirtXML(const char *filePath,
|
|||||||
result = 0;
|
result = 0;
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
xmlFreeDoc(xml);
|
|
||||||
if (result < 0) {
|
if (result < 0) {
|
||||||
g_strfreev(ret);
|
g_strfreev(ret);
|
||||||
nodeSize = -1;
|
nodeSize = -1;
|
||||||
|
@ -2789,7 +2789,7 @@ vzBakeCookie(struct _vzDriver *driver,
|
|||||||
static vzMigrationCookie *
|
static vzMigrationCookie *
|
||||||
vzEatCookie(const char *cookiein, int cookieinlen, unsigned int flags)
|
vzEatCookie(const char *cookiein, int cookieinlen, unsigned int flags)
|
||||||
{
|
{
|
||||||
xmlDocPtr doc = NULL;
|
g_autoptr(xmlDoc) doc = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctx = NULL;
|
g_autoptr(xmlXPathContext) ctx = NULL;
|
||||||
vzMigrationCookie *mig = NULL;
|
vzMigrationCookie *mig = NULL;
|
||||||
|
|
||||||
@ -2838,7 +2838,6 @@ vzEatCookie(const char *cookiein, int cookieinlen, unsigned int flags)
|
|||||||
}
|
}
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
xmlFreeDoc(doc);
|
|
||||||
return mig;
|
return mig;
|
||||||
|
|
||||||
error:
|
error:
|
||||||
|
@ -4578,7 +4578,7 @@ static virDomainSnapshotObjList *
|
|||||||
prlsdkParseSnapshotTree(const char *treexml)
|
prlsdkParseSnapshotTree(const char *treexml)
|
||||||
{
|
{
|
||||||
virDomainSnapshotObjList *ret = NULL;
|
virDomainSnapshotObjList *ret = NULL;
|
||||||
xmlDocPtr xml = NULL;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||||
xmlNodePtr root;
|
xmlNodePtr root;
|
||||||
xmlNodePtr *nodes = NULL;
|
xmlNodePtr *nodes = NULL;
|
||||||
@ -4696,7 +4696,6 @@ prlsdkParseSnapshotTree(const char *treexml)
|
|||||||
virDomainSnapshotObjListFree(snapshots);
|
virDomainSnapshotObjListFree(snapshots);
|
||||||
VIR_FREE(nodes);
|
VIR_FREE(nodes);
|
||||||
VIR_FREE(xmlstr);
|
VIR_FREE(xmlstr);
|
||||||
xmlFreeDoc(xml);
|
|
||||||
VIR_FREE(def);
|
VIR_FREE(def);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -71,7 +71,7 @@ static virCPUDef *
|
|||||||
cpuTestLoadXML(virArch arch, const char *name)
|
cpuTestLoadXML(virArch arch, const char *name)
|
||||||
{
|
{
|
||||||
char *xml = NULL;
|
char *xml = NULL;
|
||||||
xmlDocPtr doc = NULL;
|
g_autoptr(xmlDoc) doc = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||||
virCPUDef *cpu = NULL;
|
virCPUDef *cpu = NULL;
|
||||||
|
|
||||||
@ -84,7 +84,6 @@ cpuTestLoadXML(virArch arch, const char *name)
|
|||||||
virCPUDefParseXML(ctxt, NULL, VIR_CPU_TYPE_AUTO, &cpu, false);
|
virCPUDefParseXML(ctxt, NULL, VIR_CPU_TYPE_AUTO, &cpu, false);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
xmlFreeDoc(doc);
|
|
||||||
VIR_FREE(xml);
|
VIR_FREE(xml);
|
||||||
return cpu;
|
return cpu;
|
||||||
}
|
}
|
||||||
@ -96,7 +95,7 @@ cpuTestLoadMultiXML(virArch arch,
|
|||||||
unsigned int *count)
|
unsigned int *count)
|
||||||
{
|
{
|
||||||
char *xml = NULL;
|
char *xml = NULL;
|
||||||
xmlDocPtr doc = NULL;
|
g_autoptr(xmlDoc) doc = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||||
xmlNodePtr *nodes = NULL;
|
xmlNodePtr *nodes = NULL;
|
||||||
virCPUDef **cpus = NULL;
|
virCPUDef **cpus = NULL;
|
||||||
@ -129,7 +128,6 @@ cpuTestLoadMultiXML(virArch arch,
|
|||||||
cleanup:
|
cleanup:
|
||||||
VIR_FREE(xml);
|
VIR_FREE(xml);
|
||||||
VIR_FREE(nodes);
|
VIR_FREE(nodes);
|
||||||
xmlFreeDoc(doc);
|
|
||||||
return cpus;
|
return cpus;
|
||||||
|
|
||||||
cleanup_cpus:
|
cleanup_cpus:
|
||||||
|
@ -56,7 +56,7 @@ static const char metadata2_ns[] =
|
|||||||
static char *
|
static char *
|
||||||
getMetadataFromXML(virDomainPtr dom)
|
getMetadataFromXML(virDomainPtr dom)
|
||||||
{
|
{
|
||||||
xmlDocPtr doc = NULL;
|
g_autoptr(xmlDoc) doc = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||||
xmlNodePtr node;
|
xmlNodePtr node;
|
||||||
|
|
||||||
@ -76,7 +76,6 @@ getMetadataFromXML(virDomainPtr dom)
|
|||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
VIR_FREE(xml);
|
VIR_FREE(xml);
|
||||||
xmlFreeDoc(doc);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -51,7 +51,7 @@ static virQEMUCaps *
|
|||||||
testQemuGetCaps(char *caps)
|
testQemuGetCaps(char *caps)
|
||||||
{
|
{
|
||||||
virQEMUCaps *qemuCaps = NULL;
|
virQEMUCaps *qemuCaps = NULL;
|
||||||
xmlDocPtr xml;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||||
ssize_t i, n;
|
ssize_t i, n;
|
||||||
g_autofree xmlNodePtr *nodes = NULL;
|
g_autofree xmlNodePtr *nodes = NULL;
|
||||||
@ -79,12 +79,10 @@ testQemuGetCaps(char *caps)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
xmlFreeDoc(xml);
|
|
||||||
return qemuCaps;
|
return qemuCaps;
|
||||||
|
|
||||||
error:
|
error:
|
||||||
virObjectUnref(qemuCaps);
|
virObjectUnref(qemuCaps);
|
||||||
xmlFreeDoc(xml);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ struct testSetStruct {
|
|||||||
#define PARSE(xml, var) \
|
#define PARSE(xml, var) \
|
||||||
do { \
|
do { \
|
||||||
int rc; \
|
int rc; \
|
||||||
xmlDocPtr doc; \
|
g_autoptr(xmlDoc) doc = NULL; \
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL; \
|
g_autoptr(xmlXPathContext) ctxt = NULL; \
|
||||||
\
|
\
|
||||||
if (!xml) \
|
if (!xml) \
|
||||||
@ -57,7 +57,6 @@ struct testSetStruct {
|
|||||||
NULL, \
|
NULL, \
|
||||||
ctxt->node, \
|
ctxt->node, \
|
||||||
true); \
|
true); \
|
||||||
xmlFreeDoc(doc); \
|
|
||||||
if (rc < 0) \
|
if (rc < 0) \
|
||||||
goto cleanup; \
|
goto cleanup; \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
Loading…
Reference in New Issue
Block a user