External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-26 22:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Simplify control flow in virDomainDiskSourceFormat

Browse Source 
Now that the cleanup is handled automatically it can be removed.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-03-07 17:35:04 +01:00
parent 4bc429868e
commit eaef9b1f67
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/conf/domain_conf.c
View File

@ -23797,12 +23797,11 @@ virDomainDiskSourceFormat(virBufferPtr buf,
{ {
VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER;
int ret = -1;
virBufferSetChildIndent(&childBuf, buf); virBufferSetChildIndent(&childBuf, buf);
if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags) < 0) if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags) < 0)
goto cleanup; return -1;
if (policy && src->type != VIR_STORAGE_TYPE_NETWORK) if (policy && src->type != VIR_STORAGE_TYPE_NETWORK)
virBufferEscapeString(&attrBuf, " startupPolicy='%s'", virBufferEscapeString(&attrBuf, " startupPolicy='%s'",
@ -23812,15 +23811,12 @@ virDomainDiskSourceFormat(virBufferPtr buf,
virBufferAsprintf(&attrBuf, " index='%u'", src->id); virBufferAsprintf(&attrBuf, " index='%u'", src->id);
if (virDomainDiskSourceFormatPrivateData(&childBuf, src, flags, xmlopt) < 0) if (virDomainDiskSourceFormatPrivateData(&childBuf, src, flags, xmlopt) < 0)
goto cleanup; return -1;
if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0) if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0)
goto cleanup; return -1;
ret = 0; return 0;
cleanup:
return ret;
} }