From nobody Sun Feb 8 19:59:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578347934; cv=none; d=zohomail.com; s=zohoarc; b=YKNpU/QMC4QHH1T3oaAvK0ZX1KtAJQasEnq+RK+oA5FNlA2mDC7+rf0A777gUoC+Xx1YaZaAXqV6lgBefY3jt//z0EaV+74Nq+xEYrd/IjSFucl1Tdazl98w2KVVZ3HkCtouyBy7GsbTPL/vNWpdnRMm1v3cagwtpLN7lJWEy1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578347934; 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=ePiKxYTzAmLQd3mZHg/m3cd+vW3ISexcBHKT59cS1Xs=; b=aw987f4vF/xS8nZQgDjIwp1HB+KxicJSGXXpyRAdbmisbp68RPtn4g4gH/k/4XWoLS9B8Xy8cXDd7BvHtEFQ8DqK3cI4IBoBGO/53+eFweH6McH2xYrWrxIYHbJHhGMZB6l20z6JgLoKsxdw63qMTEshpwFOAhz2rPyCJqbisKE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1578347934676666.683607463849; Mon, 6 Jan 2020 13:58:54 -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-98-2Rp5caymOailUZoesH7pwg-1; Mon, 06 Jan 2020 16:58:50 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 73A568024DB; Mon, 6 Jan 2020 21:58:42 +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 4F23E858BE; Mon, 6 Jan 2020 21:58:42 +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 0AF7C1803C40; Mon, 6 Jan 2020 21:58:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 006LwauL007397 for ; Mon, 6 Jan 2020 16:58:36 -0500 Received: by smtp.corp.redhat.com (Postfix) id B10F1F9ACB; Mon, 6 Jan 2020 21:58:36 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ABB5AF84E6 for ; Mon, 6 Jan 2020 21:58:36 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8CCF3802FF3 for ; Mon, 6 Jan 2020 21:58:36 +0000 (UTC) Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-182-m96vH4EdOTWDZqvdERk4ZQ-1; Mon, 06 Jan 2020 16:58:34 -0500 Received: by mail-qk1-f177.google.com with SMTP id z76so41255985qka.2 for ; Mon, 06 Jan 2020 13:58:34 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c6:655b:9e1c:e865:3705:e1df]) by smtp.gmail.com with ESMTPSA id x34sm23898440qtd.20.2020.01.06.13.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 13:58:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578347933; 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=ePiKxYTzAmLQd3mZHg/m3cd+vW3ISexcBHKT59cS1Xs=; b=Sg5ZxtvYIDMa6kIaKb8TlbYF3MYq7khkpxQh12MDIMC8PUShrjGOaPMRpLoA58Yjg9AXjr lcb3Q55CrySpTIcdSutPtFpUZ1M/1HAhvzy5VbqT+GASYyvGrg4vlpJiqF1KYoqO9syPcJ +U0WeXi0NzbNG/qBJ3AC537qrmN3abA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cJmFqN1ik/ScGTjDxzsiDTPW9aXvQiwukizJtN8GkD4=; b=WaMFr+xCDG4+xRsDGSvlmd1Yt7LJ701DNo6YKlwW/aX+Uh8fr1hhFYCALgjMsA5Wyi x1NDSM8pm/lIz5pog/eqPh5xQdEqqou691C1bUj/rIXUvmEIYZaVtPnlAizkOW8lXKUt w9suIn3B8thY0fIs2DkpTCxDjRnUhuKdpww1eHhekvxECZS5q+WF1PVw9lEJGnZdou5G 9fkaUAfQoSdDet8Kjxi9ExYRP/fNbcy1GVdxZ0JZ1I6q3eq1rr7pIBCHkL5AECkAHKOZ Tlo1WzMgmJPKyOwcNtyH6RgqNE11GuFWL/a/m9vmQj7xZ2t6qX1NqPWiP8oNJYqA/4d+ mWMA== X-Gm-Message-State: APjAAAX/3SLxXIhoukaJRFfRR5YdwO0bekW8cb/xIZLk2k7MkN/mqczS Iq/yXapmEp9MmYc0JETW2js83Tv7 X-Google-Smtp-Source: APXvYqwuo14Hinm1qLEAWIGc7Uhu3+7ZVr2sWWAKnY/wGqrRhBapNm3d5e+hFLW4f6hLcT2GMpk5aA== X-Received: by 2002:a37:f518:: with SMTP id l24mr81217264qkk.441.1578347913336; Mon, 06 Jan 2020 13:58:33 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 6 Jan 2020 18:57:47 -0300 Message-Id: <20200106215750.361615-24-danielhb413@gmail.com> In-Reply-To: <20200106215750.361615-1-danielhb413@gmail.com> References: <20200106215750.361615-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: m96vH4EdOTWDZqvdERk4ZQ-1 X-MC-Unique: 2Rp5caymOailUZoesH7pwg-1 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 006LwauL007397 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 23/26] util: remove remaining unneeded labels 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.13 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This patch remove the remaining unneeded labels in 'util' files: virnetdev.c virnetdevmacvlan.c virnetdevtap.c virtpm.c virtypedparam.c viruuid.c Signed-off-by: Daniel Henrique Barboza --- src/util/virnetdev.c | 13 ++++--------- src/util/virnetdevmacvlan.c | 3 +-- src/util/virnetdevtap.c | 15 ++++++--------- src/util/virtpm.c | 5 ++--- src/util/virtypedparam.c | 14 ++++---------- src/util/viruuid.c | 13 +++++-------- 6 files changed, 22 insertions(+), 41 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 03e276a972..e2aad07c24 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -823,7 +823,6 @@ virNetDevGetRcvAllMulti(const char *ifname, char *virNetDevGetName(int ifindex) { char name[IFNAMSIZ]; - char *ifname =3D NULL; =20 memset(&name, 0, sizeof(name)); =20 @@ -831,13 +830,10 @@ char *virNetDevGetName(int ifindex) virReportSystemError(errno, _("Failed to convert interface index %d to a = name"), ifindex); - goto cleanup; + return NULL; } =20 - ifname =3D g_strdup(name); - - cleanup: - return ifname; + return g_strdup(name); } #else char *virNetDevGetName(int ifindex) @@ -1702,7 +1698,7 @@ virNetDevParseVfConfig(struct nlattr **tb, int32_t vf= , virMacAddrPtr mac, if (!tb[IFLA_VFINFO_LIST]) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing IFLA_VF_INFO in netlink response")); - goto cleanup; + return rc; } =20 nla_for_each_nested(tb_vf_info, tb[IFLA_VFINFO_LIST], rem) { @@ -1713,7 +1709,7 @@ virNetDevParseVfConfig(struct nlattr **tb, int32_t vf= , virMacAddrPtr mac, ifla_vf_policy)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("error parsing IFLA_VF_INFO")); - goto cleanup; + return rc; } =20 if (mac && tb[IFLA_VF_MAC]) { @@ -1739,7 +1735,6 @@ virNetDevParseVfConfig(struct nlattr **tb, int32_t vf= , virMacAddrPtr mac, virReportError(VIR_ERR_INTERNAL_ERROR, _("couldn't find IFLA_VF_INFO for VF %d " "in netlink response"), vf); - cleanup: return rc; } =20 diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 09efa04df1..3ca568fb44 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -1156,7 +1156,7 @@ int virNetDevMacVLanRestartWithVPortProfile(const cha= r *cr_ifname, linkdev, vmuuid, virtPortProfile, vmO= p); if (rc < 0) - goto error; + return rc; =20 ignore_value(virNetDevVPortProfileAssociate(cr_ifname, virtPortProfile, @@ -1166,7 +1166,6 @@ int virNetDevMacVLanRestartWithVPortProfile(const cha= r *cr_ifname, vmuuid, vmOp, true)); =20 - error: return rc; =20 } diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index e3cf44c5cb..6a16b58d60 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -514,16 +514,16 @@ virNetDevTapAttachBridge(const char *tapname, */ if (mtu > 0) { if (virNetDevSetMTU(tapname, mtu) < 0) - goto error; + return -1; } else { if (virNetDevSetMTUFromDevice(tapname, brname) < 0) - goto error; + return -1; } if (actualMTU) { int retMTU =3D virNetDevGetMTU(tapname); =20 if (retMTU < 0) - goto error; + return -1; =20 *actualMTU =3D retMTU; } @@ -532,21 +532,18 @@ virNetDevTapAttachBridge(const char *tapname, if (virtPortProfile) { if (virtPortProfile->virtPortType =3D=3D VIR_NETDEV_VPORT_PROFILE_= MIDONET) { if (virNetDevMidonetBindPort(tapname, virtPortProfile) < 0) - goto error; + return -1; } else if (virtPortProfile->virtPortType =3D=3D VIR_NETDEV_VPORT_P= ROFILE_OPENVSWITCH) { if (virNetDevOpenvswitchAddPort(brname, tapname, macaddr, vmuu= id, virtPortProfile, virtVlan) < 0) - goto error; + return -1; } } else { if (virNetDevBridgeAddPort(brname, tapname) < 0) - goto error; + return -1; } =20 return 0; - - error: - return -1; } =20 =20 diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 97013f6a7d..505a4230dd 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -216,16 +216,15 @@ virTPMExecGetCaps(virCommandPtr cmd, continue; =20 if (virBitmapSetBitExpand(bitmap, typ) < 0) - goto cleanup; + return bitmap; } =20 - cleanup: return bitmap; =20 error_bad_json: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected JSON format: %s"), outbuf); - goto cleanup; + return bitmap; } =20 static virBitmapPtr diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index be3dac1571..d6103bdcb6 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -327,12 +327,12 @@ virTypedParamsReplaceString(virTypedParameterPtr *par= ams, virReportError(VIR_ERR_INVALID_ARG, _("Parameter '%s' is not a string"), param->field); - goto error; + return -1; } old =3D param->value.s; } else { if (VIR_EXPAND_N(*params, n, 1) < 0) - goto error; + return -1; param =3D *params + n - 1; } =20 @@ -342,15 +342,12 @@ virTypedParamsReplaceString(virTypedParameterPtr *par= ams, VIR_TYPED_PARAM_STRING, str) < 0) { param->value.s =3D old; VIR_FREE(str); - goto error; + return -1; } VIR_FREE(old); =20 *nparams =3D n; return 0; - - error: - return -1; } =20 =20 @@ -404,7 +401,7 @@ virTypedParamsFilter(virTypedParameterPtr params, size_t i, n =3D 0; =20 if (VIR_ALLOC_N(*ret, nparams) < 0) - goto error; + return -1; =20 for (i =3D 0; i < nparams; i++) { if (STREQ(params[i].field, name)) { @@ -414,9 +411,6 @@ virTypedParamsFilter(virTypedParameterPtr params, } =20 return n; - - error: - return -1; } =20 =20 diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 0745189aa9..c8ee59beee 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -107,20 +107,20 @@ virUUIDParse(const char *uuidstr, unsigned char *uuid) for (i =3D 0; i < VIR_UUID_BUFLEN;) { uuid[i] =3D 0; if (*cur =3D=3D 0) - goto error; + return -1; if ((*cur =3D=3D '-') || (*cur =3D=3D ' ')) { cur++; continue; } if (!g_ascii_isxdigit(*cur)) - goto error; + return -1; uuid[i] =3D virHexToBin(*cur); uuid[i] *=3D 16; cur++; if (*cur =3D=3D 0) - goto error; + return -1; if (!g_ascii_isxdigit(*cur)) - goto error; + return -1; uuid[i] +=3D virHexToBin(*cur); i++; cur++; @@ -128,14 +128,11 @@ virUUIDParse(const char *uuidstr, unsigned char *uuid) =20 while (*cur) { if (!g_ascii_isspace(*cur)) - goto error; + return -1; cur++; } =20 return 0; - - error: - return -1; } =20 /** --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list