# HG changeset patch # User James Bowes # Date 1214247116 14400 # Node ID 634e54ca476cfbcc1a583c1fef08d2d9008e5413 # Parent 23c56c3f044967eb7de762e526fd84f4ff37f42e Actually store the files strings in the files string pool diff -r 23c56c3f0449 -r 634e54ca476c librazor/importer.c --- a/librazor/importer.c Mon Jun 23 14:04:47 2008 -0400 +++ b/librazor/importer.c Mon Jun 23 14:51:56 2008 -0400 @@ -314,7 +314,7 @@ compare_filenames, NULL); - root.name = hashtable_tokenize(&importer->table, ""); + root.name = hashtable_tokenize(&importer->file_table, ""); array_init(&root.files); array_init(&root.packages); root.last = NULL; @@ -334,7 +334,8 @@ length = end - f; memcpy(dirname, f, length); dirname[length] ='\0'; - name = hashtable_tokenize(&importer->table, dirname); + name = hashtable_tokenize(&importer->file_table, + dirname); if (d->last == NULL || d->last->name != name) { d->last = array_add(&d->files, sizeof *d); d->last->name = name; @@ -501,6 +502,8 @@ set = importer->set; hashtable_release(&importer->table); + hashtable_release(&importer->details_table); + hashtable_release(&importer->file_table); free(importer); return set; diff -r 23c56c3f0449 -r 634e54ca476c librazor/razor.c --- a/librazor/razor.c Mon Jun 23 14:04:47 2008 -0400 +++ b/librazor/razor.c Mon Jun 23 14:51:56 2008 -0400 @@ -400,7 +400,7 @@ struct razor_entry *dir, const char *pattern) { struct razor_entry *e; - const char *n, *pool = set->string_pool.data; + const char *n, *pool = set->file_string_pool.data; int len; e = (struct razor_entry *) set->files.data + dir->start;