From nobody Sun Feb 8 16:30:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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=1571737028; cv=none; d=zoho.com; s=zohoarc; b=YVYpVYN8Wz1TuCA9WoOaBYKNmFD8RNc2iDev9UImeRfVg+JFV+79y9abIYHvw1oE94+BhpXYBFemUGB4f0184D1uPVVcTh2MqRBaKLbi7hutKZtHE3IAlRAX1TCVcWyQngrmSpz+pj17Ry42MgkHymbzKfKgIH4AY7oHPidHFxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737028; 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=OA2wsdhwL3zBkNkbVNGkhMrADGurpOjji+p78l/DMWA=; b=gqvMAeh1IB0n+sWAkRrK7xlI+2MS8CgbD9bC8EB+3D6D7O/wNhABByrL3oSBRypRktff2V/zlJSxEJJAZRb5JNvUTAQopiXS7zppSTkWYrUvhf8VA/xBIZVYw92GRXkHOK3vDn3YPgmL2moL99KX412S9MvZNa52GNP2HmSOhC0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571737028927336.55818403158196; Tue, 22 Oct 2019 02:37:08 -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-204-TlTOACOHM6C5aSe7gKPBdQ-1; Tue, 22 Oct 2019 05:37:04 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 11F7B100551F; Tue, 22 Oct 2019 09:36:59 +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 E23D65C1D4; Tue, 22 Oct 2019 09:36:58 +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 A16011A502; Tue, 22 Oct 2019 09:36:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJftH000592 for ; Mon, 21 Oct 2019 14:19:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 95D025C8A6; Mon, 21 Oct 2019 18:19:41 +0000 (UTC) Received: from mx1.redhat.com (ext-mx16.extmail.prod.ext.phx2.redhat.com [10.5.110.45]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7C10D5E1D8 for ; Mon, 21 Oct 2019 18:19:41 +0000 (UTC) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 81DE13082B6D for ; Mon, 21 Oct 2019 18:19:40 +0000 (UTC) Received: by mail-qt1-f175.google.com with SMTP id c17so19468511qtn.8 for ; Mon, 21 Oct 2019 11:19:40 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737027; 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=OA2wsdhwL3zBkNkbVNGkhMrADGurpOjji+p78l/DMWA=; b=O8NPLRsYunFNqAa/plM9yKFfmtT6nEJ25lNxmngodLEEJyqpFWs5egIjqAqalPvt8YtHOk /csu9jCLtp7KVU9Afn6vkNZuNFVCe127qz+8c8Xa6mvJXj5AQOjc88iUCwDql6/oJXgJTR wEj60TjoL4lu2TuKgWQVRz1TOjR7Tyg= 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=SV3+A6oOOEynSWLDtQHoEMe11vYGEWrZXx1DUt8oHAQ=; b=t0cFyRvy05LGc8uACyYd4HOtMstAati+jMIJgNU/OFCIcS5asfkpeHpE2dPngobRMN w7Ub4Sndb3lQR26VsfOrmYIWG2OCF9Ma8FSOoIkXZy+rrsXGiLVNozZf2OpFrVuDc3nx +q5hZQHEjCTr/Vza/3f1pk/J6AMFw1gqjeCxOtvwJhzlMmgZjYuw1DksTNfaOlU8TmTK LaeQFYLcq6krW6MqzwEMnddDp0seeCyS1AbEHdAFlI+P/dP+HKxiJynkKpkZhywJP3Y3 FJ+aFMnKRzS85HYrTUrnVuxOLxv2PwA8spszr4BWAq95XUn6j1I4aOBmJVPG6DziZW+e NDJQ== X-Gm-Message-State: APjAAAV7mwZwjZ9bTjSA/vyNk1289ofZOkjxG5IY8lcAOzkxzGAs+rbs /cVmH8YgodE30B/C6UIqcPkEvLD4To4= X-Google-Smtp-Source: APXvYqzI30TBTN3WRAllC72TL9CthiBqJm4CnpcD4K/Qf0GuBYNaxkAyxWHJnXM3a2QIMoMNMg8c6g== X-Received: by 2002:ac8:18a9:: with SMTP id s38mr21048570qtj.355.1571681979547; Mon, 21 Oct 2019 11:19:39 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:19:01 -0300 Message-Id: <20191021181911.14986-12-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 21 Oct 2019 18:19:40 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 21 Oct 2019 18:19:40 +0000 (UTC) for IP:'209.85.160.175' DOMAIN:'mail-qt1-f175.google.com' HELO:'mail-qt1-f175.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.160.175 mail-qt1-f175.google.com 209.85.160.175 mail-qt1-f175.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.45 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 11/21] rpc: remove unneeded cleanup 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.16 X-MC-Unique: TlTOACOHM6C5aSe7gKPBdQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/rpc/virnetserver.c | 15 +++++---------- src/rpc/virnetserverprogram.c | 13 ++++--------- src/rpc/virnetsocket.c | 9 +++------ src/rpc/virnettlscontext.c | 20 ++++++++------------ 4 files changed, 20 insertions(+), 37 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 042661ffa5..590e780b64 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -109,7 +109,6 @@ static int virNetServerProcessMsg(virNetServerPtr srv, virNetServerProgramPtr prog, virNetMessagePtr msg) { - int ret =3D -1; if (!prog) { /* Only send back an error for type =3D=3D CALL. Other * message types are not expecting replies, so we @@ -120,7 +119,7 @@ static int virNetServerProcessMsg(virNetServerPtr srv, if (virNetServerProgramUnknownError(client, msg, &msg->header) < 0) - goto cleanup; + return -1; } else { VIR_INFO("Dropping client message, unknown program %d version = %d type %d proc %d", msg->header.prog, msg->header.vers, @@ -129,22 +128,18 @@ static int virNetServerProcessMsg(virNetServerPtr srv, virNetMessageClear(msg); msg->header.type =3D VIR_NET_REPLY; if (virNetServerClientSendMessage(client, msg) < 0) - goto cleanup; + return -1; } - goto done; + return 0; } =20 if (virNetServerProgramDispatch(prog, srv, client, msg) < 0) - goto cleanup; - - done: - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 static void virNetServerHandleJob(void *jobOpaque, void *opaque) diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index e3fa810a3f..8df92fb8df 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -312,10 +312,8 @@ int virNetServerProgramDispatch(virNetServerProgramPtr= prog, /* Send a dummy reply to free up 'msg' & unblock client rx */ virNetMessageClear(msg); msg->header.type =3D VIR_NET_REPLY; - if (virNetServerClientSendMessage(client, msg) < 0) { - ret =3D -1; - goto cleanup; - } + if (virNetServerClientSendMessage(client, msg) < 0) + return -1; ret =3D 0; break; =20 @@ -340,14 +338,11 @@ int virNetServerProgramDispatch(virNetServerProgramPt= r prog, /* Send a dummy reply to free up 'msg' & unblock client rx */ virNetMessageClear(msg); msg->header.type =3D VIR_NET_REPLY; - if (virNetServerClientSendMessage(client, msg) < 0) { - ret =3D -1; - goto cleanup; - } + if (virNetServerClientSendMessage(client, msg) < 0) + return -1; ret =3D 0; } =20 - cleanup: return ret; } =20 diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 6574ee0d16..a031133626 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -159,7 +159,6 @@ int virNetSocketCheckProtocols(bool *hasIPv4, struct ifaddrs *ifaddr =3D NULL, *ifa; struct addrinfo hints; struct addrinfo *ai =3D NULL; - int ret =3D -1; int gaierr; =20 memset(&hints, 0, sizeof(hints)); @@ -169,7 +168,7 @@ int virNetSocketCheckProtocols(bool *hasIPv4, if (getifaddrs(&ifaddr) < 0) { virReportSystemError(errno, "%s", _("Cannot get host interface addresses")); - goto cleanup; + return -1; } =20 for (ifa =3D ifaddr; ifa !=3D NULL; ifa =3D ifa->ifa_next) { @@ -197,7 +196,7 @@ int virNetSocketCheckProtocols(bool *hasIPv4, virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot resolve ::1 address: %s"), gai_strerror(gaierr)); - goto cleanup; + return -1; } } =20 @@ -205,9 +204,7 @@ int virNetSocketCheckProtocols(bool *hasIPv4, =20 VIR_DEBUG("Protocols: v4 %d v6 %d", *hasIPv4, *hasIPv6); =20 - ret =3D 0; - cleanup: - return ret; + return 0; #else *hasIPv4 =3D *hasIPv6 =3D false; virReportError(VIR_ERR_NO_SUPPORT, "%s", diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 2420ad8681..e15cd7f64a 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -610,12 +610,11 @@ static int virNetTLSContextLoadCredentials(virNetTLSC= ontextPtr ctxt, const char *cert, const char *key) { - int ret =3D -1; int err; =20 if (cacert && cacert[0] !=3D '\0') { if (virNetTLSContextCheckCertFile("CA certificate", cacert, false)= < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("loading CA cert from %s", cacert); err =3D gnutls_certificate_set_x509_trust_file(ctxt->x509cred, @@ -625,14 +624,14 @@ static int virNetTLSContextLoadCredentials(virNetTLSC= ontextPtr ctxt, virReportError(VIR_ERR_SYSTEM_ERROR, _("Unable to set x509 CA certificate: %s: %s"), cacert, gnutls_strerror(err)); - goto cleanup; + return -1; } } =20 if (cacrl && cacrl[0] !=3D '\0') { int rv; if ((rv =3D virNetTLSContextCheckCertFile("CA revocation list", ca= crl, true)) < 0) - goto cleanup; + return -1; =20 if (rv =3D=3D 0) { VIR_DEBUG("loading CRL from %s", cacrl); @@ -643,7 +642,7 @@ static int virNetTLSContextLoadCredentials(virNetTLSCon= textPtr ctxt, virReportError(VIR_ERR_SYSTEM_ERROR, _("Unable to set x509 certificate revocatio= n list: %s: %s"), cacrl, gnutls_strerror(err)); - goto cleanup; + return -1; } } else { VIR_DEBUG("Skipping non-existent CA CRL %s", cacrl); @@ -653,10 +652,10 @@ static int virNetTLSContextLoadCredentials(virNetTLSC= ontextPtr ctxt, if (cert && cert[0] !=3D '\0' && key && key[0] !=3D '\0') { int rv; if ((rv =3D virNetTLSContextCheckCertFile("certificate", cert, !is= Server)) < 0) - goto cleanup; + return -1; if (rv =3D=3D 0 && (rv =3D virNetTLSContextCheckCertFile("private key", key, !isS= erver)) < 0) - goto cleanup; + return -1; =20 if (rv =3D=3D 0) { VIR_DEBUG("loading cert and key from %s and %s", cert, key); @@ -668,7 +667,7 @@ static int virNetTLSContextLoadCredentials(virNetTLSCon= textPtr ctxt, virReportError(VIR_ERR_SYSTEM_ERROR, _("Unable to set x509 key and certificate: = %s, %s: %s"), key, cert, gnutls_strerror(err)); - goto cleanup; + return -1; } } else { VIR_DEBUG("Skipping non-existent cert %s key %s on client", @@ -676,10 +675,7 @@ static int virNetTLSContextLoadCredentials(virNetTLSCo= ntextPtr ctxt, } } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list