1.1 --- a/razor.c	Thu Jan 10 21:08:03 2008 -0500
     1.2 +++ b/razor.c	Thu Jan 10 22:07:07 2008 -0500
     1.3 @@ -411,12 +411,6 @@
     1.4  	return hashtable_insert(table, string);
     1.5  }
     1.6  
     1.7 -static unsigned long
     1.8 -razor_importer_tokenize(struct razor_importer *importer, const char *string)
     1.9 -{
    1.10 -	return hashtable_tokenize(&importer->table, string);
    1.11 -}
    1.12 -
    1.13  void
    1.14  razor_importer_begin_package(struct razor_importer *importer,
    1.15  			     const char *name, const char *version)
    1.16 @@ -424,8 +418,8 @@
    1.17  	struct razor_package *p;
    1.18  
    1.19  	p = array_add(&importer->set->packages, sizeof *p);
    1.20 -	p->name = razor_importer_tokenize(importer, name);
    1.21 -	p->version = razor_importer_tokenize(importer, version);
    1.22 +	p->name = hashtable_tokenize(&importer->table, name);
    1.23 +	p->version = hashtable_tokenize(&importer->table, version);
    1.24  
    1.25  	importer->package = p;
    1.26  	array_init(&importer->properties);
    1.27 @@ -452,8 +446,8 @@
    1.28  	unsigned long *r;
    1.29  
    1.30  	p = array_add(&importer->set->properties, sizeof *p);
    1.31 -	p->name = razor_importer_tokenize(importer, name) | (type << 30);
    1.32 -	p->version = razor_importer_tokenize(importer, version);
    1.33 +	p->name = hashtable_tokenize(&importer->table, name) | (type << 30);
    1.34 +	p->version = hashtable_tokenize(&importer->table, version);
    1.35  	p->packages = importer->package -
    1.36  		(struct razor_package *) importer->set->packages.data;
    1.37  
    1.38 @@ -813,7 +807,7 @@
    1.39  			compare_filenames,
    1.40  			NULL);
    1.41  
    1.42 -	root.name = razor_importer_tokenize(importer, "");
    1.43 +	root.name = hashtable_tokenize(&importer->table, "");
    1.44  	array_init(&root.files);
    1.45  	array_init(&root.packages);
    1.46  	root.last = NULL;
    1.47 @@ -833,7 +827,7 @@
    1.48  			length = end - f;
    1.49  			memcpy(dirname, f, length);
    1.50  			dirname[length] ='\0';
    1.51 -			name = razor_importer_tokenize(importer, dirname);
    1.52 +			name = hashtable_tokenize(&importer->table, dirname);
    1.53  			if (d->last == NULL || d->last->name != name) {
    1.54  				d->last = array_add(&d->files, sizeof *d);
    1.55  				d->last->name = name;