From ddf48de4c8626fb9604e36bd7402eb1aefc98c62 Mon Sep 17 00:00:00 2001
From: Tim Wiederhake <twiederh@redhat.com>
Date: Mon, 8 Nov 2021 11:34:54 +0100
Subject: [PATCH] virBufferAddBuffer: Cleanup
Remove unnecessary label and goto.
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
src/util/virbuffer.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
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;
+ if (buf) {
+ virBufferInitialize(buf);
+ g_string_append_len(buf->str, toadd->str->str, toadd->str->len);
+ }
- virBufferInitialize(buf);
- g_string_append_len(buf->str, toadd->str->str, toadd->str->len);
-
- cleanup:
virBufferFreeAndReset(toadd);
}