The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c06962057bedb3f1ed8c3560c1d1147dbf04ba68
commit c06962057bedb3f1ed8c3560c1d1147dbf04ba68
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2023-11-15 02:35:27 +0000
Commit: John Baldwin <j...@freebsd.org>
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 */
