From nobody Wed Jan 03 17:50:03 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T4y0r0Zr8z56MMX; Wed, 3 Jan 2024 17:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T4y0q4y2Mz4rfq; Wed, 3 Jan 2024 17:50:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704304203; h=from:from: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; bh=7efjMlkfU+6Sz4Rzb2GXNKNkR44i6PRIf5VPjLsGsws=; b=od1xG49AVfMJe0nOCa5jONsCOgqiO7/SbGme772lu3lvFQee6k2UesUhJwmDG08spJJ4fk 056ZE5hmATs3JS6VYGBrUQ2UT+fMDCIeqRGVHWWzGTsssyo/vl64m4J2avGS0TPNFOzJ2E CkaKU/AxBa3ZJq9/sGf+MCmAJK0u1cIaE8FDhsbnwgU+ljtK3Ae2/2NOJscwx8w503q8kM 57DI6KwOOUWSENysEOtrhAl+yh8wXYEebNfXPbweFcQxSa+hQXGlg6mkTwy6E+CvwPFTT1 XMrGfBgJ3CBrEpuWQ3NR4pwRHi2XNlpOBWOMWZ4ARXgDzbOsvS9ZxlHNvUlriA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704304203; h=from:from: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; bh=7efjMlkfU+6Sz4Rzb2GXNKNkR44i6PRIf5VPjLsGsws=; b=pM9srkcVkZ3zR954wGURZwswKXViEbB5KQyN1CWnWbqDOOQeaaJDc5Zwnyv3G94x78JGaq uQOv2iZm70QK8kxZPyxb6aqx6wogbDeTNtLJOMXvXLfnQCmf9bO0h6g1MNzuSD3HSqw1+x yVU7oPq0E0YxyriKLd9GzM1UvBaxVn6JG3qea0300imw3Nl4BM3KNZg1hHbDWnc2ttIP4C 3AStYTT/gc/R5KITdBLgByJMme45WhWZVLMuI0SKXEPKIV2mdOGVm8UAVcTEm6oFdTxdVV PtK7vM/El0HH1RooaqvvyUefqdbAHl6tHkbHPbRLfqXmrXbydBMvUvdv+RW9mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704304203; a=rsa-sha256; cv=none; b=yzuZDrsp/GNGYGscRtuBcRVCux+bSrjMpj+qsCJx0xxL0lOQIQbAPZLuniDjqd0rQgrfQ1 TJ08fcu4a07jP1vX5NkMGOzfWV8GK28RL8FBfLHd19xxXe8tyRL9AnWPTkclgzuUa8Rbr8 ECVYi+e9VFkx1uePjdOMNEhT9GTeD1tcMeFMytEGDJP1clcv5MJb3/UfJatysT3/Iqj7zx ZsEoypPZpHWf9RFzzgQ++ZA8Q0Mgmh3ST/ILNXqSVQsW+El2Bk+nwnLTKeCl6zLWOE3fm/ bPdaPU7n6aL3aIcRvmqVhBT+Lp/9tqgIq4REYMsrmbrvq4hgXV3Ne24+YrQDWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T4y0q3zrqzvLv; Wed, 3 Jan 2024 17:50:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 403Ho3nM037212; Wed, 3 Jan 2024 17:50:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403Ho3h3037207; Wed, 3 Jan 2024 17:50:03 GMT (envelope-from git) Date: Wed, 3 Jan 2024 17:50:03 GMT Message-Id: <202401031750.403Ho3h3037207@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 3a54d200ae87 - stable/14 - makefs cd9660: Unexpand a few TAILQ macros List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3a54d200ae8773f263281fcc2075e7dcebf3d3fc Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3a54d200ae8773f263281fcc2075e7dcebf3d3fc commit 3a54d200ae8773f263281fcc2075e7dcebf3d3fc Author: John Baldwin AuthorDate: 2023-11-15 02:35:27 +0000 Commit: John Baldwin CommitDate: 2024-01-03 17:43:48 +0000 makefs cd9660: Unexpand a few TAILQ macros Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D42580 (cherry picked from commit c06962057bedb3f1ed8c3560c1d1147dbf04ba68) --- usr.sbin/makefs/cd9660.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index cc56421a873c..7ce9a3b6cbb2 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1516,10 +1516,10 @@ cd9660_generate_path_table(iso9660_disk *diskStructure) TAILQ_INSERT_HEAD(&pt_head, n, ptq); /* Breadth-first traversal of file structure */ - while (pt_head.tqh_first != 0) { - n = pt_head.tqh_first; + while (!TAILQ_EMPTY(&pt_head)) { + n = TAILQ_FIRST(&pt_head); dirNode = n->node; - TAILQ_REMOVE(&pt_head, pt_head.tqh_first, ptq); + TAILQ_REMOVE(&pt_head, n, ptq); free(n); /* Update the size */