Use ARCHIVE_RB_TREE_FOREACH() macro.

Temporary code caused SEGFAULTS since __archive_rb_tree_iterate() was fixed.

SVN-Revision: 2355

diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c
index 730d70c088ecd233200ad327b197664334ed1fd6..8f187239af3c55d1b36ed8cf59501bf195ff58a8 100644 (file)
--- 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;
        }