From nobody Wed Feb 11 05:11:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1626940323; cv=none; d=zohomail.com; s=zohoarc; b=eVfctFhSMsEs8UYmtEuzxWV2j4jMLj5a6EBM03LJ4YVngdOdukzraOodka4vzWis+U8tmi6IOSV30uED4XVtKG6RQXF4TWArFEfp8omva4Ielj1xKfQZVfVSX+XrDSbu44aD5UFmz97d7Wf+E9W622JNLH31hMZ2q4HtN/1DKrU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626940323; 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=MskO8Z12FumCrkQaEm+MmHCd4BzBjAund/DucRBZ/es=; b=RRxQzL8qO/jPl/ySd1hT/PtXtPXhCfp+g7ZIt9jGFg3CR8M1JAvwjx7RMoRK5pFAkX1dhEd1x+PwsmmGiCMo2XkvNdLqZ/w3eNZUZmLjqugat53xJbeLg51o3jYa0UGSyNfHlrWeI28CBIOYjutjjNaDwBleJHgNbsgDP+Mrc5E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1626940323327321.6803147149591; Thu, 22 Jul 2021 00:52:03 -0700 (PDT) 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-80-d7PFMMzYN3aijFVVJtnyfQ-1; Thu, 22 Jul 2021 03:50:55 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1FBEF1084F53; Thu, 22 Jul 2021 07:50:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EF1BF10016F2; Thu, 22 Jul 2021 07:50:49 +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 BA0A6181A292; Thu, 22 Jul 2021 07:50:49 +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 16M7oi0i009463 for ; Thu, 22 Jul 2021 03:50:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9B7C95DAA5; Thu, 22 Jul 2021 07:50:44 +0000 (UTC) Received: from work.redhat.com (ovpn-112-127.ams2.redhat.com [10.36.112.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4AEE5D9DD; Thu, 22 Jul 2021 07:50:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626940322; 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=MskO8Z12FumCrkQaEm+MmHCd4BzBjAund/DucRBZ/es=; b=hNFB5gcHDJY5vtIhS2JEvNuLFkVr6X+An2urghTh+mO+DpSYPoOQmTClge7PbW95q7rnZi WHK9ZvQ/GAyFAICY7NvQtBf7Oei8AsdewbnYsSSpgr5MwE9hzCGgUEFJcBr8udRmVeCACF nCIqEv0vQ//RTdL/sO8uXO4wdCDzfOo= X-MC-Unique: d7PFMMzYN3aijFVVJtnyfQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 06/38] virNWFilterCreateVarsFrom: Remove superfluous `goto`s Date: Thu, 22 Jul 2021 09:49:58 +0200 Message-Id: <20210722075030.25495-7-twiederh@redhat.com> In-Reply-To: <20210722075030.25495-1-twiederh@redhat.com> References: <20210722075030.25495-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.84 on 10.5.11.22 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: 1626940324396100010 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/nwfilter/nwfilter_gentech_driver.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter= _gentech_driver.c index d17be401e6..a425285e8c 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -202,15 +202,12 @@ virNWFilterCreateVarsFrom(GHashTable *vars1, g_autoptr(GHashTable) res =3D virHashNew(virNWFilterVarValueHashFree); =20 if (virNWFilterHashTablePutAll(vars1, res) < 0) - goto error; + return NULL; =20 if (virNWFilterHashTablePutAll(vars2, res) < 0) - goto error; + return NULL; =20 return g_steal_pointer(&res); - - error: - return NULL; } =20 =20 --=20 2.31.1