From nobody Mon Feb 9 16:02:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1636373938; cv=none; d=zohomail.com; s=zohoarc; b=mXbUi+KGBxV1HFXa7PSYlNi47NVWOvCg9auTSQjkXDx3fndx8l/bbqtL317TtSgZCI0rOF6Ab8b3f0pVpiOEFADg8aMm/yBABko2KosmYaQJxN2AxmABxDxGRSZPodiSYuSIF7ed7g7hINL2z/fLtZOYx+7pwG70brxhEbGYizA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636373938; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/FSqb5knTTLszIQz5KNv6i6mcUDgn804DULKOtPe20E=; b=l9kYKBYNkpFdxfPrDJlXbeSkKwveNMQ59bQz97GE2UwdDQGWEzAvIFAMBUFx6jwUmGlrkDO7XiEYxnX7gpRhJdRnkWNbq3TNdfQB354WF8Dp1dssVhmwdHm7JUUvgHvQkYmCSa2ri+ThX1CJ3g8vqxRyJP1pmz8usXEG3Ln5z0M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1636373938139913.3732099402619; Mon, 8 Nov 2021 04:18:58 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-100-Qu8bmWD-P12Wds2jG87ieg-1; Mon, 08 Nov 2021 07:18:55 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 804BE1030C20; Mon, 8 Nov 2021 12:18:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5474C62A41; Mon, 8 Nov 2021 12:18:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1F8E64EA30; Mon, 8 Nov 2021 12:18:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A8CInvb011842 for ; Mon, 8 Nov 2021 07:18:49 -0500 Received: by smtp.corp.redhat.com (Postfix) id B72D41816A; Mon, 8 Nov 2021 12:18:49 +0000 (UTC) Received: from work.redhat.com (unknown [10.39.193.223]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0909D5DA61; Mon, 8 Nov 2021 12:18:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636373937; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/FSqb5knTTLszIQz5KNv6i6mcUDgn804DULKOtPe20E=; b=h5gEzHe3KRsZ7jsr0NHqfIxF/H3pseFffx8xerPbPQW3+zdasj8gglR5gdo5HY8Fc/bGim MHhK6wDds89k8NM2MQahj/RMEHJFKEmR0zXi9Va/wc5HFbOOF2fcFLC2+3yZeG1WN3DSUZ QkENyFrubQHeblWfq6F1GZpziZpfuUU= X-MC-Unique: Qu8bmWD-P12Wds2jG87ieg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 06/10] virBufferAddBuffer: Cleanup Date: Mon, 8 Nov 2021 13:17:36 +0100 Message-Id: <20211108121740.98621-7-twiederh@redhat.com> In-Reply-To: <20211108121740.98621-1-twiederh@redhat.com> References: <20211108121740.98621-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1636373939736100001 Content-Type: text/plain; charset="utf-8" Remove unnecessary label and goto. Signed-off-by: Tim Wiederhake --- 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; =20 - 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); + } =20 - cleanup: virBufferFreeAndReset(toadd); } =20 --=20 2.31.1