From nobody Sun Feb 8 10:50:29 2026 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 1532806885142928.7010217773644; Sat, 28 Jul 2018 12:41:25 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 45D43307D854; Sat, 28 Jul 2018 19:41:23 +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 131CFCFBF7; Sat, 28 Jul 2018 19:41:23 +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 AE25A1800FED; Sat, 28 Jul 2018 19:41:22 +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 w6SJfJxT020914 for ; Sat, 28 Jul 2018 15:41:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 772C867CEF; Sat, 28 Jul 2018 19:41:19 +0000 (UTC) Received: from mx1.redhat.com (ext-mx15.extmail.prod.ext.phx2.redhat.com [10.5.110.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6E2A26596C for ; Sat, 28 Jul 2018 19:41:19 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (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 273DA30832DC for ; Sat, 28 Jul 2018 19:41:18 +0000 (UTC) Received: by mail-pg1-f172.google.com with SMTP id p23-v6so5064894pgv.13 for ; Sat, 28 Jul 2018 12:41:18 -0700 (PDT) Received: from centos.localdomain ([49.32.98.239]) by smtp.gmail.com with ESMTPSA id m26-v6sm20270426pfi.102.2018.07.28.12.41.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Jul 2018 12:41:17 -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=vEPGK9lk9BLYUZZZM03g6X8I6CTAj9H+GNDkP8gCrnU=; b=torHojW9pO63VH7+AuZm6whySvF1wv4jt2YhCLG6KtLFXgy5WiBg7yre5kfbOXf5JC G8j0+6wPWiYjBfRnE63WlkS6D+zEgstvCAn5qJLbVeFuXtFyFueZo+FZFLyH2xE/257r /XXvjo0UVsPgxpdgMiumHlgJLDKkiiVuARuwVl+oIKHXO0S0dDG4J87M0Zj33ZJCveWx sdPs7IV7tnJs2CIxyO/Pj8m4LMIbE66nmDN6NtBrD+eHFlVadoyKUf7A81NhcgSBR+8L lgSeIIr5aT1Uo7Qdnn6ZrCeEHXxiJF6NfnvSxKvZTJvRpsEzlSXyUb70vXD2rmGXZyzD HNYw== 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=vEPGK9lk9BLYUZZZM03g6X8I6CTAj9H+GNDkP8gCrnU=; b=aMdGPtY0VswRpH4QnEUmk/eQT8D2iHvpjbJBJXmxX/tw8vn5UUh3xfAOeIvWy1cyke I53fS0n4raLHOj+nMHH5FELJJWHJV90XpMbeiYP3kv0XZeqONx+hePOUbEVojoOBtCyS d+cK84JDOm/6jdx5fefY62NPCqPUEzMjZgXuBwnBVRa2Rtpz092+0JT0210TWomvNkXc De4Nv+q28CF82Aj0NMjcXLvd9BwlEAeIzdkAIDUVGLJ7avhE65EGn1lmNFVWxtv8U0Bh RMJZgESK5dV++++jsIUI/qzFqWi45NOF82NvjaZEIwz8zXEfekfk1qU6ySJ8XQHsIYdb yt7w== X-Gm-Message-State: AOUpUlGuQIVG+cng40/BLAInD12I75z9eJCYY4d3xHnjr9Nv9A04IZp6 +zw7d18eipEI2oqoUurWZ0hkU2lj X-Google-Smtp-Source: AAOMgpdJTQlLj+RR3xcR6xBZT8eTyZbQx21I3sIYawN1gj4tye7xFOCo0I6Pd0gVnlFHqMz3nnllfw== X-Received: by 2002:a62:9dcc:: with SMTP id a73-v6mr11394409pfk.249.1532806877394; Sat, 28 Jul 2018 12:41:17 -0700 (PDT) From: Sukrit Bhatnagar To: libvir-list@redhat.com Date: Sat, 28 Jul 2018 23:31:36 +0530 Message-Id: <1532800907-29115-22-git-send-email-skrtbhtngr@gmail.com> In-Reply-To: <1532800907-29115-1-git-send-email-skrtbhtngr@gmail.com> References: <1532800907-29115-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.44]); Sat, 28 Jul 2018 19:41:18 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Sat, 28 Jul 2018 19:41:18 +0000 (UTC) for IP:'209.85.215.172' DOMAIN:'mail-pg1-f172.google.com' HELO:'mail-pg1-f172.google.com' FROM:'skrtbhtngr@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.111 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS) 209.85.215.172 mail-pg1-f172.google.com 209.85.215.172 mail-pg1-f172.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.44 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v1 21/32] util: netdevveth: use VIR_AUTOPTR for aggregate 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.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Sat, 28 Jul 2018 19:41:23 +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 GNU C's cleanup attribute handled by the VIR_AUTOPTR macro for declaring aggregate pointer variables, majority of the calls to *Free functions can be dropped, which in turn leads to getting rid of most of our cleanup sections. Signed-off-by: Sukrit Bhatnagar Reviewed-by: Erik Skultety --- src/util/virnetdevveth.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 8c1a7f3..0b94f73 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -111,7 +111,6 @@ int virNetDevVethCreate(char** veth1, char** veth2) { int ret =3D -1; int vethNum =3D 0; - virCommandPtr cmd =3D NULL; size_t i; =20 /* @@ -124,6 +123,7 @@ int virNetDevVethCreate(char** veth1, char** veth2) for (i =3D 0; i < MAX_VETH_RETRIES; i++) { VIR_AUTOFREE(char *) veth1auto =3D NULL; VIR_AUTOFREE(char *) veth2auto =3D NULL; + VIR_AUTOPTR(virCommand) cmd =3D NULL; =20 int status; if (!*veth1) { @@ -173,8 +173,6 @@ int virNetDevVethCreate(char** veth1, char** veth2) *veth1 ? *veth1 : veth1auto, *veth2 ? *veth2 : veth2auto, status); - virCommandFree(cmd); - cmd =3D NULL; } =20 virReportError(VIR_ERR_INTERNAL_ERROR, @@ -183,7 +181,6 @@ int virNetDevVethCreate(char** veth1, char** veth2) =20 cleanup: virMutexUnlock(&virNetDevVethCreateMutex); - virCommandFree(cmd); return ret; } =20 @@ -200,26 +197,22 @@ int virNetDevVethCreate(char** veth1, char** veth2) */ int virNetDevVethDelete(const char *veth) { - virCommandPtr cmd =3D virCommandNewArgList("ip", "link", "del", veth, = NULL); + VIR_AUTOPTR(virCommand) cmd =3D NULL; + cmd =3D virCommandNewArgList("ip", "link", "del", veth, NULL); int status; - int ret =3D -1; =20 if (virCommandRun(cmd, &status) < 0) - goto cleanup; + return -1; =20 if (status !=3D 0) { if (!virNetDevExists(veth)) { VIR_DEBUG("Device %s already deleted (by kernel namespace clea= nup)", veth); - ret =3D 0; - goto cleanup; + return 0; } virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to delete veth device %s"), veth); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - virCommandFree(cmd); - return ret; + return 0; } --=20 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list