# HG changeset patch
# User J. Ali Harlow <ali@juiblex.co.uk>
# Date 1231933675 0
# Node ID 3ad2e14e4cb709c287d46575ee17e351f81a84d1
# Parent  7538f8dc442549ab7cd28099751e4742fa34c262
Fix bug causing merger to place file names in the main string pool
rather than the files string pool.

diff -r 7538f8dc4425 -r 3ad2e14e4cb7 librazor/merger.c
--- a/librazor/merger.c	Tue Jan 13 17:04:51 2009 +0000
+++ b/librazor/merger.c	Wed Jan 14 11:47:55 2009 +0000
@@ -32,6 +32,7 @@
 struct razor_merger {
 	struct razor_set *set;
 	struct hashtable table;
+	struct hashtable file_table;
 	struct source source1;
 	struct source source2;
 };
@@ -46,6 +47,7 @@
 	merger = zalloc(sizeof *merger);
 	merger->set = razor_set_create();
 	hashtable_init(&merger->table, &merger->set->string_pool);
+	hashtable_init(&merger->file_table, &merger->set->file_string_pool);
 
 	merger->source1.set = set1;
 	count = set1->properties.size / sizeof (struct razor_property);
@@ -213,7 +215,7 @@
 	struct razor_entry *e;
 
 	e = array_add(&merger->set->files, sizeof *e);
-	e->name = hashtable_tokenize(&merger->table, name);
+	e->name = hashtable_tokenize(&merger->file_table, name);
 	e->flags = 0;
 	e->start = 0;
 
@@ -519,6 +521,7 @@
 
 	result = merger->set;
 	hashtable_release(&merger->table);
+	hashtable_release(&merger->file_table);
 	free(merger);
 
 	return result;