git: a6817cd6fac8 - stable/13 - makefs cd9660: Unexpand a few TAILQ macros
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 30 Nov 2024 19:09:08 UTC
The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a6817cd6fac8c0b01f7d4aeb19f12356a7de642f commit a6817cd6fac8c0b01f7d4aeb19f12356a7de642f Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2023-11-15 02:35:27 +0000 Commit: John Baldwin <jhb@FreeBSD.org> 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 */