From nobody Sun Feb 8 20:17:52 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 1552472120275614.5457056649923; Wed, 13 Mar 2019 03:15:20 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7F6371E317; Wed, 13 Mar 2019 10:15:18 +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 4AB9E5D75C; Wed, 13 Mar 2019 10:15:18 +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 DE9503FAF4; Wed, 13 Mar 2019 10:15:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2DADEp8004117 for ; Wed, 13 Mar 2019 06:13:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id A831E19C65; Wed, 13 Mar 2019 10:13:14 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B3E64521 for ; Wed, 13 Mar 2019 10:13:14 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Wed, 13 Mar 2019 11:13:08 +0100 Message-Id: <0e1838373e4db528c28f877e97ee26a0d9484005.1552471966.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] virFileWrapper: Use VIR_AUTOFREE() 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 13 Mar 2019 10:15:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This enables us to simplify the code a bit. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- tests/virfilewrapper.c | 81 ++++++++++-------------------------------- 1 file changed, 18 insertions(+), 63 deletions(-) diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index 497e91bd45..88441331ce 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -152,110 +152,74 @@ virFileWrapperOverridePrefix(const char *path) =20 FILE *fopen(const char *path, const char *mode) { - FILE *ret =3D NULL; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real_fopen(newpath, mode); - - VIR_FREE(newpath); - - return ret; + return real_fopen(newpath, mode); } =20 int access(const char *path, int mode) { - int ret =3D -1; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real_access(newpath, mode); - - VIR_FREE(newpath); - - return ret; + return real_access(newpath, mode); } =20 # ifdef HAVE___LXSTAT int __lxstat(int ver, const char *path, struct stat *sb) { - int ret =3D -1; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real___lxstat(ver, newpath, sb); - - VIR_FREE(newpath); - - return ret; + return real___lxstat(ver, newpath, sb); } # endif /* HAVE___LXSTAT */ =20 int lstat(const char *path, struct stat *sb) { - int ret =3D -1; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real_lstat(newpath, sb); - - VIR_FREE(newpath); - - return ret; + return real_lstat(newpath, sb); } =20 # ifdef HAVE___XSTAT int __xstat(int ver, const char *path, struct stat *sb) { - int ret =3D -1; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real___xstat(ver, newpath, sb); - - VIR_FREE(newpath); - - return ret; + return real___xstat(ver, newpath, sb); } # endif /* HAVE___XSTAT */ =20 int stat(const char *path, struct stat *sb) { - int ret =3D -1; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real_stat(newpath, sb); - - VIR_FREE(newpath); - - return ret; + return real_stat(newpath, sb); } =20 int mkdir(const char *path, mode_t mode) { - int ret =3D -1; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real_mkdir(newpath, mode); - - VIR_FREE(newpath); - - return ret; + return real_mkdir(newpath, mode); } =20 int open(const char *path, int flags, ...) { - int ret =3D -1; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; va_list ap; mode_t mode =3D 0; =20 @@ -270,24 +234,15 @@ int open(const char *path, int flags, ...) va_end(ap); } =20 - ret =3D real_open(newpath, flags, mode); - - VIR_FREE(newpath); - - return ret; + return real_open(newpath, flags, mode); } =20 DIR *opendir(const char *path) { - DIR *ret =3D NULL; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real_opendir(newpath); - - VIR_FREE(newpath); - - return ret; + return real_opendir(newpath); } #endif --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list