From nobody Mon Feb 9 10:27:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603848980; cv=none; d=zohomail.com; s=zohoarc; b=myaHQqaYKVfED7k8XfgIokuZMtMyUTbbcVIqqWI/Pf5c8ZrONj9p5nMfPj50SLqpB5IwVRJuK2e2vh9u8qAStIZktsH8Km62Z50fLPBZD7aEbTjIS8Tv0ouajVelOXvMkB81KS18AuGzwyBkbm/fIgqi56jktIzgoE0nZLK8jf4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603848980; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u9Kd1eGQAvlRfuH0NCn4FSsJwduyZwkPC4lekfAdhCc=; b=Udb49810qWmR8erQda3mHbqA27OeB14rmTpwMRBXrr1klxqw5lidh2t/sC5mrLdviRP0Z07RPY170s5OMy9jIp5suonYM5uKEsvhr7w5gP178q3FDU0eiTnrWP0A7k2iKPfhZRcXVorNVuXofAz3l7aaQ7XQv4wSbQyjiJqBLws= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603848980925744.2691645422796; Tue, 27 Oct 2020 18:36:20 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-590-9fcgIWpFMtqk95L85_4Edw-1; Tue, 27 Oct 2020 21:36:17 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5380A83DC24; Wed, 28 Oct 2020 01:36:12 +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 2E5EF6EF71; Wed, 28 Oct 2020 01:36:12 +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 CB5B75810F; Wed, 28 Oct 2020 01:36:09 +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 09S1a7LU028245 for ; Tue, 27 Oct 2020 21:36:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id EF8195C22B; Wed, 28 Oct 2020 01:36:07 +0000 (UTC) Received: from vhost2.laine.org (ovpn-113-144.phx2.redhat.com [10.3.113.144]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF03C5C22A for ; Wed, 28 Oct 2020 01:36:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603848979; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=u9Kd1eGQAvlRfuH0NCn4FSsJwduyZwkPC4lekfAdhCc=; b=ax8fPk+nZXma7G/6GjYpj5DruMD6PSx0v5amYQ7IdPr4zCLn/KI7BsXKhv/ldvohGTc8+3 emrVVaOXTuvspPvTwsPDzHA208C+eSPvFwPOGU2RLQVQPvKi3HtN5yQELGYyzCmBJ+zzv4 AEfNXSWDBoJZiqLfaH+M36+qjVfcbpM= X-MC-Unique: 9fcgIWpFMtqk95L85_4Edw-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 04/12] util: reduce scope of a DIR * in virCgroupV1SetOwner() Date: Tue, 27 Oct 2020 21:35:50 -0400 Message-Id: <20201028013558.424925-5-laine@redhat.com> In-Reply-To: <20201028013558.424925-1-laine@redhat.com> References: <20201028013558.424925-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" DIR *dh is being re-used each time through the for loop of this function, so it must be closed and then re-opened, which means we can't convert it to g_autoptr. By moving the definition of dh inside the for loop, we make it possible to trivially convert to g_autoptr (which will happen in a subsequent patch) NB: VIR_DIR_CLOSE() is already called at the bottom of the for loop, so removing the VIR_DIR_CLOSE() at the end of the function is *not* creating a leak of a DIR*! Signed-off-by: Laine Stump --- src/util/vircgroupv1.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 91c1c4d4b1..67b35c1b9a 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -875,12 +875,12 @@ virCgroupV1SetOwner(virCgroupPtr cgroup, { int ret =3D -1; size_t i; - DIR *dh =3D NULL; int direrr; =20 for (i =3D 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { g_autofree char *base =3D NULL; struct dirent *de; + DIR *dh =3D NULL; =20 if (!((1 << i) & controllers)) continue; @@ -922,7 +922,6 @@ virCgroupV1SetOwner(virCgroupPtr cgroup, ret =3D 0; =20 cleanup: - VIR_DIR_CLOSE(dh); return ret; } =20 --=20 2.26.2