Use the file string pool when merging directories.
authorKristian H?gsberg <krh@redhat.com>
Tue Jul 08 21:55:56 2008 -0400 (2008-07-08)
changeset 313643c4a94c2ae
parent 312 068a7429db5d
child 314 df5dc9230730
Use the file string pool when merging directories.
librazor/merger.c
     1.1 --- a/librazor/merger.c	Wed Jul 02 14:39:44 2008 -0400
     1.2 +++ b/librazor/merger.c	Tue Jul 08 21:55:56 2008 -0400
     1.3 @@ -261,8 +261,8 @@
     1.4  	set2 = merger->source2.set;
     1.5  	map1 = merger->source1.file_map;
     1.6  	map2 = merger->source2.file_map;
     1.7 -	pool1 = set1->string_pool.data;
     1.8 -	pool2 = set2->string_pool.data;
     1.9 +	pool1 = set1->file_string_pool.data;
    1.10 +	pool2 = set2->file_string_pool.data;
    1.11  	root1 = (struct razor_entry *) set1->files.data;
    1.12  	root2 = (struct razor_entry *) set2->files.data;
    1.13