From nobody Wed Nov 15 02:37:45 2023 X-Original-To: dev-commits-src-main@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 4SVS4n4qLqz50XBp; Wed, 15 Nov 2023 02:37:45 +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 4SVS4n4MQpz4XgW; Wed, 15 Nov 2023 02:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700015865; 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=CqTagZpI8RMzN6H9dcUGHP4Fm91IEekRy3jTPKVGL4U=; b=YZElWG+BryXzsYtGomg2Rspe/OjfK333TPYvR/nCqhl/KT5jD+4WZpgubXIPXtI58prbIq rydlszZmuglPU1NIxCfCZ9sSt0lolQlk8rZpsMQdj4czG7JWua0xHU0dQVApJZYC5aZye7 2LyAISGEywzYAm4RQmVMcSswukfyUbuK2JzU+GIe43dbiWoJq4tIGBD4Df8XtUi1Gq3ZuU /VzOPLzQzl6QvCxbV21++8CVeYw4FhmZrBbbUu6cQV6xvFQjWZKr7RIRoTOtkEqWrCjdqZ WefLYgyHRqDBPuEoIU7PArZKndkyv4SdmWmEwpZDV2feGEc4gPvvsjyAMr7jLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700015865; 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=CqTagZpI8RMzN6H9dcUGHP4Fm91IEekRy3jTPKVGL4U=; b=X7hPR62NAFeEoNhBh0z44Yx5DpaMJ2KMusfhC5PB76Ww2NymDyrbO0MgiM3vlC3B0oILAT gOaaL3dq9G8oKt1l/IQE8crKR+/KMwjhYzXVKuGpcV0nWsbr7kaRACjoqECtr023k/XFYa uOzDdEGE59cZAGyKiCJqYTj6fAfm36DNAxusXpzSIwvDaHmxH7Ok+ZMRZ+iqRVSs3SwI5+ RN8E2dMdVNd/n+IA/Ci/01wjYTLbs1XS9a+sbyuiuPnQuCmgCDEDoj0ZV83u/UJQMT1ppR 0/t2amQ6CyGxW1rRnYZyzTc4+c89/cpWRYfqAcjXx8XChAwvNrln6BcwWBgGeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700015865; a=rsa-sha256; cv=none; b=eY5rDgD8mPGXndvTBpWeAy5sYrtswkdO0xVhD1EqtGg7hYz/NRncZ6MPv/VM4F/kFDK8vQ kV9oaPPoOadsf4jM8k442k6Szt2gvIY3QeWEEdGrDjaxZHSep/lFtlBhnW79XWDUv62khd yb2eQLIlS0BmYuqQ/3pfuc6OpQv4rm538bcVEkOSjdBSr2Kz5XW7qQlcZ6GveOawY3+QRH mrZsE7uGYhGgfi+ZoqAjJLJiytePhzaQUM4B7jcriVEQ6ecwO6wDRWJP4V5zYIEJxc4oDA v5mCnVvwKhk/pQ3wxboSCRYztLPp5Fygx4VBxlpHtSRYa3IbEl6bVeNusqzoSg== 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 4SVS4n3MY2z1DKy; Wed, 15 Nov 2023 02:37:45 +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 3AF2bjBX009775; Wed, 15 Nov 2023 02:37:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AF2bjfj009772; Wed, 15 Nov 2023 02:37:45 GMT (envelope-from git) Date: Wed, 15 Nov 2023 02:37:45 GMT Message-Id: <202311150237.3AF2bjfj009772@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c06962057bed - main - makefs cd9660: Unexpand a few TAILQ macros List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c06962057bedb3f1ed8c3560c1d1147dbf04ba68 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c06962057bedb3f1ed8c3560c1d1147dbf04ba68 commit c06962057bedb3f1ed8c3560c1d1147dbf04ba68 Author: John Baldwin AuthorDate: 2023-11-15 02:35:27 +0000 Commit: John Baldwin CommitDate: 2023-11-15 02:35:27 +0000 makefs cd9660: Unexpand a few TAILQ macros Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D42580 --- 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 3429e2a33b4c..8cdfaee9464c 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1508,10 +1508,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 */