From nobody Tue May 13 22:24:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1528400128433493.85712394171946; Thu, 7 Jun 2018 12:35:28 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 084993086275; Thu, 7 Jun 2018 19:35:27 +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 C7C6C2016A80; Thu, 7 Jun 2018 19:35:26 +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 69C894CA89; Thu, 7 Jun 2018 19:35:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w57JZJuP018931 for ; Thu, 7 Jun 2018 15:35:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 13AEE20155E5; Thu, 7 Jun 2018 19:35:19 +0000 (UTC) Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com [10.5.110.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 08AED20155E2 for ; Thu, 7 Jun 2018 19:35:14 +0000 (UTC) Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) (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 C9F258111C for ; Thu, 7 Jun 2018 19:35:03 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id b17-v6so5403279pfi.0 for ; Thu, 07 Jun 2018 12:35:03 -0700 (PDT) Received: from centos.localdomain ([49.32.106.159]) by smtp.gmail.com with ESMTPSA id d23-v6sm86686407pfn.3.2018.06.07.12.35.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 12:35:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=BWqKXnlvBAl+ZJecDmL9sJOAttHUf8nBgPST+4XkY3U=; b=oFLd5gXNxYOTRFdevGXKmzwGGjSlNpoB4HBtq+lS6KXwatsVrOU70V116AA+6veKpZ OdsXHigf3KFaQ5IiscBVeeZL0IDnEwjWNbiE4OJnEMhR7izJrhLu5z5Nz2plkVLi1jxe /MEGuwZdwTx47OapCCpZftataNnq3/XN/zJ/y4m03vNjOi/NleLVeUZmH6EUX43CBw/c DYQIS4J2983XV/L/bH4dkBzvwmtfBLd9tt7LeX5ieEQ4LgZ8SwBxG0X7KpQl9AHeR6xX Ulk0NGReCPxRSGm0zcESDMQMTtbGA/GDcev4Uq8kNUD189Wvyk9/MrEQPBfazBMbOBiE n0dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=BWqKXnlvBAl+ZJecDmL9sJOAttHUf8nBgPST+4XkY3U=; b=Wu27OsWNI4vqUtKifHmmaT6mHFTcVdn1yL6yrEtg2XErc0DYmY7bwgd+D8VWEte6CB WeIt2MD5hyRQfNBrKD0BiQUL6nsTofBI/gY3iRjbTkwFS/jUssacLNDK5xZXdWgMUrkc K5pRQJ2fLpINdF6mq/mnX8i7Kf3cn3AW3WW5wjWjstejcWrsoVUDY8kTvEAh/+a2PtFW /yzrQKbeROeAKx9wshYuhLLeViNeCWgb+rgQFcV1aZqsuIFtHEE4TYw3e/68+cnBa3/4 4Dv2LEvzaZWlrZhV94JseDeF0q9tHR1gHubZwTVtA8/mfaYfWIXlD9V1rtaI7eREOLMc 0P/w== X-Gm-Message-State: APt69E1aJZ15aGoJbMiS3c/a43ssUw3u+vONqu7UHsuXDzdC6Dfc/Ks2 bpn/6rMUPyOzcQ1S1Jo9+I5LgCxK X-Google-Smtp-Source: ADUXVKLoN/iWTwb/Jq1pRxZdBewv3543CAT4rItoW0dsznZ8U+FqRGEtpDREhoZ2EMMm673pvMINAQ== X-Received: by 2002:a63:3759:: with SMTP id g25-v6mr2690478pgn.59.1528400102884; Thu, 07 Jun 2018 12:35:02 -0700 (PDT) From: Sukrit Bhatnagar To: libvir-list@redhat.com Date: Fri, 8 Jun 2018 01:04:27 +0530 Message-Id: <1528400083-6788-6-git-send-email-skrtbhtngr@gmail.com> In-Reply-To: <1528400083-6788-1-git-send-email-skrtbhtngr@gmail.com> References: <1528400083-6788-1-git-send-email-skrtbhtngr@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 07 Jun 2018 19:35:04 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 07 Jun 2018 19:35:04 +0000 (UTC) for IP:'209.85.192.195' DOMAIN:'mail-pf0-f195.google.com' HELO:'mail-pf0-f195.google.com' FROM:'skrtbhtngr@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.511 (DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, NML_ADSP_CUSTOM_MED, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS, T_DKIM_INVALID) 209.85.192.195 mail-pf0-f195.google.com 209.85.192.195 mail-pf0-f195.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.28 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v1 05/21] util: fcp: use VIR_AUTOFREE instead of VIR_FREE for scalar types 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Thu, 07 Jun 2018 19:35:27 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" By making use of the GCC's __attribute__((cleanup)) handled by VIR_AUTOFREE macro, majority of the VIR_FREE calls can be dropped, which in turn leads to getting rid of most of our cleanup sections. --- src/util/virfcp.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/util/virfcp.c b/src/util/virfcp.c index 7660ba7..b703744 100644 --- a/src/util/virfcp.c +++ b/src/util/virfcp.c @@ -40,16 +40,12 @@ bool virFCIsCapableRport(const char *rport) { - bool ret =3D false; - char *path =3D NULL; + VIR_AUTOFREE(char *) path =3D NULL; =20 if (virBuildPath(&path, SYSFS_FC_RPORT_PATH, rport) < 0) return false; =20 - ret =3D virFileExists(path); - VIR_FREE(path); - - return ret; + return virFileExists(path); } =20 int @@ -57,8 +53,8 @@ virFCReadRportValue(const char *rport, const char *entry, char **result) { - int ret =3D -1; - char *buf =3D NULL, *p =3D NULL; + VIR_AUTOFREE(char *) buf =3D NULL; + char *p =3D NULL; =20 if (virFileReadValueString(&buf, "%s/%s/%s", SYSFS_FC_RPORT_PATH, rport, entry) < 0) { @@ -69,13 +65,9 @@ virFCReadRportValue(const char *rport, *p =3D '\0'; =20 if (VIR_STRDUP(*result, buf) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - VIR_FREE(buf); - return ret; + return 0; } =20 #else --=20 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list