1.1 --- a/razor.c	Wed Feb 20 13:34:55 2008 -0500
     1.2 +++ b/razor.c	Wed Feb 20 16:54:03 2008 -0500
     1.3 @@ -1582,7 +1582,6 @@
     1.4  	struct array *pkgs, *a;
     1.5  	struct razor_package *pkg, *pkg_end;
     1.6  	struct razor_property *prop, *prop_end;
     1.7 -	struct array *pool;
     1.8  	struct list *r;
     1.9  	uint32_t *q;
    1.10  	int count;
    1.11 @@ -1590,10 +1589,9 @@
    1.12  	count = set->properties.size / sizeof (struct razor_property);
    1.13  	pkgs = zalloc(count * sizeof *pkgs);
    1.14  	pkg_end = set->packages.data + set->packages.size;
    1.15 -	pool = &set->property_pool;
    1.16  
    1.17  	for (pkg = set->packages.data; pkg < pkg_end; pkg++) {
    1.18 -		r = list_first(&pkg->properties, pool);
    1.19 +		r = list_first(&pkg->properties, &set->property_pool);
    1.20  		while (r) {
    1.21  			q = array_add(&pkgs[r->data], sizeof *q);
    1.22  			*q = pkg - (struct razor_package *) set->packages.data;
    1.23 @@ -1604,7 +1602,7 @@
    1.24  	prop_end = set->properties.data + set->properties.size;
    1.25  	a = pkgs;
    1.26  	for (prop = set->properties.data; prop < prop_end; prop++, a++) {
    1.27 -		list_set_array(&prop->packages, pool, a, 0);
    1.28 +		list_set_array(&prop->packages, &set->package_pool, a, 0);
    1.29  		array_release(a);
    1.30  	}
    1.31  	free(pkgs);
    1.32 @@ -1616,7 +1614,6 @@
    1.33  	struct array *pkgs, *a;
    1.34  	struct razor_package *pkg, *pkg_end;
    1.35  	struct razor_entry *entry, *entry_end;
    1.36 -	struct array *pool;
    1.37  	struct list *r;
    1.38  	uint32_t *q;
    1.39  	int count;
    1.40 @@ -1624,10 +1621,9 @@
    1.41  	count = set->files.size / sizeof (struct razor_entry);
    1.42  	pkgs = zalloc(count * sizeof *pkgs);
    1.43  	pkg_end = set->packages.data + set->packages.size;
    1.44 -	pool = &set->file_pool;
    1.45  
    1.46  	for (pkg = set->packages.data; pkg < pkg_end; pkg++) {
    1.47 -		r = list_first(&pkg->files, pool);
    1.48 +		r = list_first(&pkg->files, &set->file_pool);
    1.49  		while (r) {
    1.50  			q = array_add(&pkgs[r->data], sizeof *q);
    1.51  			*q = pkg - (struct razor_package *) set->packages.data;
    1.52 @@ -1638,7 +1634,7 @@
    1.53  	entry_end = set->files.data + set->files.size;
    1.54  	a = pkgs;
    1.55  	for (entry = set->files.data; entry < entry_end; entry++, a++) {
    1.56 -		list_set_array(&entry->packages, pool, a, 0);
    1.57 +		list_set_array(&entry->packages, &set->package_pool, a, 0);
    1.58  		array_release(a);
    1.59  	}
    1.60  	free(pkgs);