From: Tim Wiederhake <twiederh@redhat.com>
Date: Mon, 8 Nov 2021 10:34:54 +0000 (+0100)
Subject: virBufferAddBuffer: Cleanup
X-Git-Tag: v7.10.0-rc1~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddf48de4c8626fb9604e36bd7402eb1aefc98c62;p=thirdparty%2Flibvirt.git

virBufferAddBuffer: Cleanup

Remove unnecessary label and goto.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
index 8f9cd57e06..a4834174a1 100644
--- a/src/util/virbuffer.c
+++ b/src/util/virbuffer.c
@@ -185,13 +185,11 @@ virBufferAddBuffer(virBuffer *buf, virBuffer *toadd)
     if (!toadd || !toadd->str)
         return;
 
-    if (!buf)
-        goto cleanup;
-
-    virBufferInitialize(buf);
-    g_string_append_len(buf->str, toadd->str->str, toadd->str->len);
+    if (buf) {
+        virBufferInitialize(buf);
+        g_string_append_len(buf->str, toadd->str->str, toadd->str->len);
+    }
 
- cleanup:
     virBufferFreeAndReset(toadd);
 }