From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Thu, 29 Apr 2010 08:47:30 +0000 (-0400)
Subject: Use __archive_rb_tree_init() instead of directly initialization.
X-Git-Tag: v3.0.0a~1049
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e69fc21f0e0a5040ad8f0d8d35dfbf6d0fd4e62;p=thirdparty%2Flibarchive.git

Use __archive_rb_tree_init() instead of directly initialization.

SVN-Revision: 2343
---

diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c
index 7402ccc5d..730d70c08 100644
--- a/libarchive/archive_write_set_format_iso9660.c
+++ b/libarchive/archive_write_set_format_iso9660.c
@@ -4838,8 +4838,7 @@ isoent_new(struct isofile *file)
 	isoent->file = file;
 	isoent->children.first = NULL;
 	isoent->children.last = &(isoent->children.first);
-	isoent->rbtree.rbt_root = NULL;
-	isoent->rbtree.rbt_ops = &rb_ops;
+	__archive_rb_tree_init(&(isoent->rbtree), &rb_ops);
 	isoent->subdirs.first = NULL;
 	isoent->subdirs.last = &(isoent->subdirs.first);
 	isoent->extr_rec_list.first = NULL;
@@ -5583,8 +5582,7 @@ idr_start(struct archive_write *a, struct idr *idr, int cnt, int ffmax,
 	r = idr_ensure_poolsize(a, idr, cnt);
 	if (r != ARCHIVE_OK)
 		return (r);
-	idr->rbtree.rbt_root = NULL;
-	idr->rbtree.rbt_ops = rbt_ops;
+	__archive_rb_tree_init(&(idr->rbtree), rbt_ops);
 	idr->wait_list.first = NULL;
 	idr->wait_list.last = &(idr->wait_list.first);
 	idr->pool_idx = 0;