From: Kristian Høgsberg <krh@redhat.com>
Date: Wed, 9 Jul 2008 01:55:56 +0000 (-0400)
Subject: Use the file string pool when merging directories.
X-Git-Tag: 0.1~65
X-Git-Url: http://project.juiblex.co.uk/git/?a=commitdiff_plain;h=a54a032daaf935da3006902c7fbc7064026cd158;p=razor2.git%2F.git

Use the file string pool when merging directories.
---

diff --git a/librazor/merger.c b/librazor/merger.c
index 636903a..1d1615e 100644
--- a/librazor/merger.c
+++ b/librazor/merger.c
@@ -261,8 +261,8 @@ merge_one_directory(struct razor_merger *merger, struct merge_directory *md)
 	set2 = merger->source2.set;
 	map1 = merger->source1.file_map;
 	map2 = merger->source2.file_map;
-	pool1 = set1->string_pool.data;
-	pool2 = set2->string_pool.data;
+	pool1 = set1->file_string_pool.data;
+	pool2 = set2->file_string_pool.data;
 	root1 = (struct razor_entry *) set1->files.data;
 	root2 = (struct razor_entry *) set2->files.data;