From eaef9b1f6727581100e46aa0943c2193f4992048 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 7 Mar 2019 17:35:04 +0100 Subject: [PATCH] conf: Simplify control flow in virDomainDiskSourceFormat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that the cleanup is handled automatically it can be removed. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/conf/domain_conf.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3770a82fa3..bbcc618001 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -23797,12 +23797,11 @@ virDomainDiskSourceFormat(virBufferPtr buf, { VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; - int ret = -1; virBufferSetChildIndent(&childBuf, buf); if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags) < 0) - goto cleanup; + return -1; if (policy && src->type != VIR_STORAGE_TYPE_NETWORK) virBufferEscapeString(&attrBuf, " startupPolicy='%s'", @@ -23812,15 +23811,12 @@ virDomainDiskSourceFormat(virBufferPtr buf, virBufferAsprintf(&attrBuf, " index='%u'", src->id); if (virDomainDiskSourceFormatPrivateData(&childBuf, src, flags, xmlopt) < 0) - goto cleanup; + return -1; if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } -- GitLab