From nobody Sat Nov 30 19:09:08 2024 X-Original-To: dev-commits-src-all@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 4Y102s0B6Zz5fVXm; Sat, 30 Nov 2024 19:09:09 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y102r5xK7z4FP6; Sat, 30 Nov 2024 19:09:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732993748; 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=3FyJYcYAQKamUPAaYdGIKarBvwoFz5wbOFlL+WsawMM=; b=WP7jBF+jZUEq4K17wrC5j/w321EnbMfFh0+Sxi5sd/0et+gD4ImUTuSNUuSDwWg1aQRJMs rXcR5Lh4L/PlFnPpMHnWOrWBjuXnAn2okOhQT3F04dkz4c3x5xrX2kPVDcO45wyu5egOwZ 9sFmU3zQh91A7AuT1o8TIZg1xBU5bt5P6Hr+Q2A2dyRgFq++7PJ6CWF1Mwecq6nPWtQj9I sNr4rjIqp5VBIuV8kTwccpKylkELoGyT6LozhSkF+MFNp9I6vbCd5SYWNLYVdm1rKeYwvt og8gpDWLNHqWu20Rg6iLjpiFcLVn63hvocsQQ0R2ebHnl2IYEQr5QtBYnjhZsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732993748; 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=3FyJYcYAQKamUPAaYdGIKarBvwoFz5wbOFlL+WsawMM=; b=BdVUql/HA2m4cqhEGgmvTDfYrp4cV2u+nM+eu5ImQF27+UNSXI6q2I568O5DCgB0tkBioS bOBhdeXcG/uJHF0DchzEdGSv+NQbSUZmRTzRDKlH2dXnUCZxs4hVN/knDQWOrlpN5xTVLK XsU/99l2XYtqCj1Rx0q3TLiq5vf1LwmcHU3vaO/BUlS8CMMYsJbxoW/8HNGz0XjNG2zMvg U8u0AiknWq2kHGx0PmSFZpzmDM2AVm23HlGT+oThLr2IudZPvbJuR7W3Mmo4eK88T23UCW QZwOFLwRvZWWsXVD3qAWJP7KK1yQS7F+iAQuR91LlywY5vlOvd+sRasGSEPOKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732993748; a=rsa-sha256; cv=none; b=LL1lGuu7li3re6VVm5TUoWGYHY9mwYODsXaq91wgcwDOwwvI5mPfY3HEGLbj+WB1hKqflS zyU1ND24/BC5UTWxKapPGB9kjvLF45bXk20531rr4IQMzvL5govQ4zR8HOYWcf4+OeT4cr vkBt0S1KcUz+sNcWHKioY7jF8EMDrznCf12+z6gRUgfpBEKB8AEW8pcRG62Fm08G8XEKB+ e8Xm2JqJgKEjMGN6CQ8+u5MurKTYO4ZIhaYzA26szuDNa0FM/qCRaQ49pyTHNR6O0gqhsb xc5WdRSuz2vXiZiJkN/Lqj5Qqo6Ui2GXWpCy7MW3XeIvRRLPfQhUAthZo2scfA== 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 4Y102r5QpTzL6D; Sat, 30 Nov 2024 19:09:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AUJ98SF097287; Sat, 30 Nov 2024 19:09:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AUJ98X0097284; Sat, 30 Nov 2024 19:09:08 GMT (envelope-from git) Date: Sat, 30 Nov 2024 19:09:08 GMT Message-Id: <202411301909.4AUJ98X0097284@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: a6817cd6fac8 - stable/13 - makefs cd9660: Unexpand a few TAILQ macros List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: a6817cd6fac8c0b01f7d4aeb19f12356a7de642f Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a6817cd6fac8c0b01f7d4aeb19f12356a7de642f commit a6817cd6fac8c0b01f7d4aeb19f12356a7de642f Author: John Baldwin AuthorDate: 2023-11-15 02:35:27 +0000 Commit: John Baldwin CommitDate: 2024-11-30 18:55:37 +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 */