From 1c5b341a995f48b66c727b01d9a830bf00e90cab Mon Sep 17 00:00:00 2001 From: Michihiro NAKAJIMA Date: Sun, 2 May 2010 00:01:06 -0400 Subject: [PATCH] Use ARCHIVE_RB_TREE_FOREACH() macro. Temporary code caused SEGFAULTS since __archive_rb_tree_iterate() was fixed. SVN-Revision: 2355 --- libarchive/archive_write_set_format_iso9660.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c index 730d70c08..8f187239a 100644 --- a/libarchive/archive_write_set_format_iso9660.c +++ b/libarchive/archive_write_set_format_iso9660.c @@ -6243,10 +6243,7 @@ isoent_make_sorted_files(struct archive_write *a, struct isoent *isoent, } isoent->children_sorted = children; - //ARCHIVE_RB_TREE_FOREACH(rn, &(idr->rbtree)) { - for ((rn) = ARCHIVE_RB_TREE_MIN(&(idr->rbtree)); (rn); - (rn) = __archive_rb_tree_iterate((&(idr->rbtree)), - (rn), ARCHIVE_RB_DIR_LEFT)) { + ARCHIVE_RB_TREE_FOREACH(rn, &(idr->rbtree)) { struct idrent *idrent = (struct idrent *)rn; *children ++ = idrent->isoent; } -- 2.47.3