razor.c
changeset 167 28e203d118c7
parent 166 8a1573991d22
child 168 680d18568209
     1.1 --- a/razor.c	Tue Mar 11 18:08:12 2008 -0400
     1.2 +++ b/razor.c	Tue Mar 11 18:12:02 2008 -0400
     1.3 @@ -125,11 +125,13 @@
     1.4  {
     1.5  	struct razor_set *set;
     1.6  	struct razor_entry *e;
     1.7 +	char *empty;
     1.8  
     1.9  	set = zalloc(sizeof *set);
    1.10  
    1.11 -	array_init(&set->files);
    1.12  	e = array_add(&set->files, sizeof *e);
    1.13 +	empty = array_add(&set->string_pool, 1);
    1.14 +	*empty = '\0';
    1.15  	e->name = 0;
    1.16  	e->flags = RAZOR_ENTRY_LAST;
    1.17  	e->start = 0;
    1.18 @@ -1609,8 +1611,6 @@
    1.19  	map2 = merger->source2.file_map;
    1.20  
    1.21  	md.merged = 0;
    1.22 -	root = (struct razor_entry *) merger->set->files.data;
    1.23 -	root->name = hashtable_tokenize(&merger->table, "");
    1.24  
    1.25  	if (merger->source1.set->files.size) {
    1.26  		root = (struct razor_entry *) merger->source1.set->files.data;