From 7c0d731fc4c28cdd0fffb265eddcab218c2c8089 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 11 Mar 2008 18:12:02 -0400 Subject: [PATCH] move the initialization of the root entry name to razor_set_create --- razor.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/razor.c b/razor.c index 435a38b..50d9626 100644 --- a/razor.c +++ b/razor.c @@ -125,11 +125,13 @@ razor_set_create(void) { 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 @@ merge_files(struct razor_merger *merger) 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; -- 1.7.1