1.1 --- a/librazor/merger.c	Tue Jul 08 21:56:53 2008 -0400
     1.2 +++ b/librazor/merger.c	Wed Jan 14 11:47:55 2009 +0000
     1.3 @@ -32,6 +32,7 @@
     1.4  struct razor_merger {
     1.5  	struct razor_set *set;
     1.6  	struct hashtable table;
     1.7 +	struct hashtable file_table;
     1.8  	struct source source1;
     1.9  	struct source source2;
    1.10  };
    1.11 @@ -46,6 +47,7 @@
    1.12  	merger = zalloc(sizeof *merger);
    1.13  	merger->set = razor_set_create();
    1.14  	hashtable_init(&merger->table, &merger->set->string_pool);
    1.15 +	hashtable_init(&merger->file_table, &merger->set->file_string_pool);
    1.16  
    1.17  	merger->source1.set = set1;
    1.18  	count = set1->properties.size / sizeof (struct razor_property);
    1.19 @@ -213,7 +215,7 @@
    1.20  	struct razor_entry *e;
    1.21  
    1.22  	e = array_add(&merger->set->files, sizeof *e);
    1.23 -	e->name = hashtable_tokenize(&merger->table, name);
    1.24 +	e->name = hashtable_tokenize(&merger->file_table, name);
    1.25  	e->flags = 0;
    1.26  	e->start = 0;
    1.27  
    1.28 @@ -519,6 +521,7 @@
    1.29  
    1.30  	result = merger->set;
    1.31  	hashtable_release(&merger->table);
    1.32 +	hashtable_release(&merger->file_table);
    1.33  	free(merger);
    1.34  
    1.35  	return result;