From nobody Mon Feb 9 02:13:17 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; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1549651119998789.0285795383617; Fri, 8 Feb 2019 10:38:39 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 23B3F4CE91; Fri, 8 Feb 2019 18:38:38 +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 DA4D317BBA; Fri, 8 Feb 2019 18:38:37 +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 8F5963D39F; Fri, 8 Feb 2019 18:38:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x18Ic7ON007837 for ; Fri, 8 Feb 2019 13:38:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2005F17BB6; Fri, 8 Feb 2019 18:38:07 +0000 (UTC) Received: from unknown0050b6a41c42.attlocal.net.com (ovpn-117-20.phx2.redhat.com [10.3.117.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id D00DE60BE0 for ; Fri, 8 Feb 2019 18:38:06 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Fri, 8 Feb 2019 13:37:24 -0500 Message-Id: <20190208183726.30903-31-jferlan@redhat.com> In-Reply-To: <20190208183726.30903-1-jferlan@redhat.com> References: <20190208183726.30903-1-jferlan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 30/32] util: Rename variable in virStorageSourceNewFromBacking 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 08 Feb 2019 18:38:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" To prepare for subsequent change to use VIR_AUTOPTR logic rename the @ret to @def. Signed-off-by: John Ferlan Reviewed-by: Erik Skultety Reviewed-by: J=C3=A1n Tomko --- src/util/virstoragefile.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index d2636eec0a..5a8e5667f5 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -3669,39 +3669,39 @@ virStorageSourcePtr virStorageSourceNewFromBacking(virStorageSourcePtr parent) { struct stat st; - virStorageSourcePtr ret; + virStorageSourcePtr def; =20 if (virStorageIsRelative(parent->backingStoreRaw)) - ret =3D virStorageSourceNewFromBackingRelative(parent, + def =3D virStorageSourceNewFromBackingRelative(parent, parent->backingStoreR= aw); else - ret =3D virStorageSourceNewFromBackingAbsolute(parent->backingStor= eRaw); + def =3D virStorageSourceNewFromBackingAbsolute(parent->backingStor= eRaw); =20 - if (ret) { + if (def) { /* possibly update local type */ - if (ret->type =3D=3D VIR_STORAGE_TYPE_FILE) { - if (stat(ret->path, &st) =3D=3D 0) { + if (def->type =3D=3D VIR_STORAGE_TYPE_FILE) { + if (stat(def->path, &st) =3D=3D 0) { if (S_ISDIR(st.st_mode)) { - ret->type =3D VIR_STORAGE_TYPE_DIR; - ret->format =3D VIR_STORAGE_FILE_DIR; + def->type =3D VIR_STORAGE_TYPE_DIR; + def->format =3D VIR_STORAGE_FILE_DIR; } else if (S_ISBLK(st.st_mode)) { - ret->type =3D VIR_STORAGE_TYPE_BLOCK; + def->type =3D VIR_STORAGE_TYPE_BLOCK; } } } =20 /* copy parent's labelling and other top level stuff */ - if (virStorageSourceInitChainElement(ret, parent, true) < 0) + if (virStorageSourceInitChainElement(def, parent, true) < 0) goto error; =20 - ret->readonly =3D true; - ret->detected =3D true; + def->readonly =3D true; + def->detected =3D true; } =20 - return ret; + return def; =20 error: - virStorageSourceFree(ret); + virStorageSourceFree(def); return NULL; } =20 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list