From 2ef76026857e7ce2dd76a8e6daa09ea602349ed4 Mon Sep 17 00:00:00 2001 From: Barrett Schonefeld Date: Mon, 23 Nov 2020 16:09:45 -0600 Subject: [PATCH] util: storageencryption: remove cleanup labels MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Barrett Schonefeld Reviewed-by: Ján Tomko Signed-off-by: Ján Tomko --- src/util/virstorageencryption.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/util/virstorageencryption.c b/src/util/virstorageencryption.c index ed29b4cfa5..a330b79637 100644 --- a/src/util/virstorageencryption.c +++ b/src/util/virstorageencryption.c @@ -176,13 +176,12 @@ static int virStorageEncryptionInfoParseCipher(xmlNodePtr info_node, virStorageEncryptionInfoDefPtr info) { - int ret = -1; g_autofree char *size_str = NULL; if (!(info->cipher_name = virXMLPropString(info_node, "name"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("cipher info missing 'name' attribute")); - goto cleanup; + return -1; } if ((size_str = virXMLPropString(info_node, "size")) && @@ -190,22 +189,19 @@ virStorageEncryptionInfoParseCipher(xmlNodePtr info_node, virReportError(VIR_ERR_XML_ERROR, _("cannot parse cipher size: '%s'"), size_str); - goto cleanup; + return -1; } if (!size_str) { virReportError(VIR_ERR_XML_ERROR, "%s", _("cipher info missing 'size' attribute")); - goto cleanup; + return -1; } info->cipher_mode = virXMLPropString(info_node, "mode"); info->cipher_hash = virXMLPropString(info_node, "hash"); - ret = 0; - - cleanup: - return ret; + return 0; }