# HG changeset patch # User Dan Winship # Date 1205273522 14400 # Node ID 28e203d118c7714f595956b2045c85273620660f # Parent 8a1573991d22f5b8a686edf1c1fcaf2f735dd8ed move the initialization of the root entry name to razor_set_create diff -r 8a1573991d22 -r 28e203d118c7 razor.c --- a/razor.c Tue Mar 11 18:08:12 2008 -0400 +++ b/razor.c Tue Mar 11 18:12:02 2008 -0400 @@ -125,11 +125,13 @@ { struct razor_set *set; struct razor_entry *e; + char *empty; set = zalloc(sizeof *set); - array_init(&set->files); e = array_add(&set->files, sizeof *e); + empty = array_add(&set->string_pool, 1); + *empty = '\0'; e->name = 0; e->flags = RAZOR_ENTRY_LAST; e->start = 0; @@ -1609,8 +1611,6 @@ map2 = merger->source2.file_map; md.merged = 0; - root = (struct razor_entry *) merger->set->files.data; - root->name = hashtable_tokenize(&merger->table, ""); if (merger->source1.set->files.size) { root = (struct razor_entry *) merger->source1.set->files.data;