From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sun, 2 May 2010 04:01:06 +0000 (-0400)
Subject: Use ARCHIVE_RB_TREE_FOREACH() macro.
X-Git-Tag: v3.0.0a~1038
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c5b341a995f48b66c727b01d9a830bf00e90cab;p=thirdparty%2Flibarchive.git

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 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;
 	}