From nobody Tue Sep 9 19:11:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1752766164; cv=none; d=zohomail.com; s=zohoarc; b=nrGytmZlAiYTYRlZDHrPfm9IQRLTEjhuD9HH7AVo5+FTMjIpkdlGBJ8TebQw/QOY8mJtZOjiS96TqWaoPlwwzbxlCLKDaLdQPn7MeJNG62XhZtK4Ogh0W+I+kF86ZXunXUMykUbxb94nG8C+yPYSUyZbnBWBMO46DptjKCDl+Cg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752766164; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=ZkDt1t0GO3X+oGj0JCbFM5+4DL55JgnChk2uLyzve+I=; b=SNSTVV7eaEx/3IfHS9YSGCryq/YMh9A99Ve5yYVJKnh8C/szi46oIWKSVXlsh1UYsBG5Wyk8gz6SsmoeoBpE/RixY6nd1FdfnaKyR9vdo0zDUmvYfxuYHl1t4nXyGfhU6JhbywlvC0TpHY1QwN/JWWRUhAD+pG0NceHw3BiXwQw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1752766164387158.36898023542267; Thu, 17 Jul 2025 08:29:24 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 62C6A153C; Thu, 17 Jul 2025 11:29:23 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B9A761571; Thu, 17 Jul 2025 11:28:23 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5674F1273; Thu, 17 Jul 2025 11:28:18 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D4FB6121C for ; Thu, 17 Jul 2025 11:28:17 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-116-r77eOrtmOZyCXyjOnvfhjQ-1; Thu, 17 Jul 2025 11:28:16 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 74DF6193E8DC for ; Thu, 17 Jul 2025 15:28:15 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.5]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A0BF6180049D for ; Thu, 17 Jul 2025 15:28:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752766097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jS5EIvusZ1/qT8z4j5qsodRWTYyM9cjK7fg37//l4BY=; b=XBC6g/WchIM4H6dZfA3Lk4WyJfpwPSg7CjZyn6AUkCb48i9571YoQ/ugnjqtPKFLWK+Rwr Xii0Ttf6CVA9E9IXUzbSf/JXEvKBe5s7clnQw/beP1oLLDyfzBW1xQQN4a4bm80JZK+4mB vK4EFwIDI4TVNm+/woDb1ocwrmQPyNM= X-MC-Unique: r77eOrtmOZyCXyjOnvfhjQ-1 X-Mimecast-MFC-AGG-ID: r77eOrtmOZyCXyjOnvfhjQ_1752766095 To: devel@lists.libvirt.org Subject: [PATCH 2/7] virNetTLSContextNewPath: Refactor temporary variable usage Date: Thu, 17 Jul 2025 17:28:05 +0200 Message-ID: <5d6b6934ef31ff2c4d9807ca39e63e7a7081f1d7.1752766013.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: EEVWe4MnGrt_UIfEQRmUqRMOCjY8Lpr5XjWArNBUplQ_1752766095 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: GAIR7VYTQTVCUJTEZI7G5K5QOYIFAK6N X-Message-ID-Hash: GAIR7VYTQTVCUJTEZI7G5K5QOYIFAK6N X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1752766165735116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Use autofree for all temporary variables and return the result directly. Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrang=C3=A9 --- src/rpc/virnettlscontext.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index bf83857a05..f857bb2339 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -308,23 +308,18 @@ static virNetTLSContext *virNetTLSContextNewPath(cons= t char *pkipath, bool requireValidCert, bool isServer) { - char *cacert =3D NULL, *cacrl =3D NULL, *key =3D NULL, *cert =3D NULL; - virNetTLSContext *ctxt =3D NULL; + g_autofree char *cacert =3D NULL; + g_autofree char *cacrl =3D NULL; + g_autofree char *key =3D NULL; + g_autofree char *cert =3D NULL; if (virNetTLSContextLocateCredentials(pkipath, tryUserPkiPath, isServe= r, &cacert, &cacrl, &cert, &key) < = 0) return NULL; - ctxt =3D virNetTLSContextNew(cacert, cacrl, cert, key, + return virNetTLSContextNew(cacert, cacrl, cert, key, x509dnACL, priority, sanityCheckCert, requireValidCert, isServer); - - VIR_FREE(cacert); - VIR_FREE(cacrl); - VIR_FREE(key); - VIR_FREE(cert); - - return ctxt; } virNetTLSContext *virNetTLSContextNewServerPath(const char *pkipath, --=20 2.50.0