1.1 --- a/razor.c	Wed Feb 06 12:59:27 2008 -0500
     1.2 +++ b/razor.c	Wed Feb 06 13:02:50 2008 -0500
     1.3 @@ -336,7 +336,7 @@
     1.4  
     1.5  	p = array_add(pool, properties->size);
     1.6  	memcpy(p, properties->data, properties->size);
     1.7 -	p[properties->size / sizeof *p - 1] |= RAZOR_IMMEDIATE;
     1.8 +	p[properties->size / sizeof *p - 1] |= RAZOR_ENTRY_LAST;
     1.9  
    1.10  	return p - (uint32_t *) pool->data;
    1.11  }
    1.12 @@ -432,11 +432,9 @@
    1.13  void
    1.14  razor_importer_finish_package(struct razor_importer *importer)
    1.15  {
    1.16 -	struct razor_package *p;
    1.17 -
    1.18 -	p = importer->package;
    1.19 -	p->properties = add_to_property_pool(&importer->set->property_pool,
    1.20 -					     &importer->properties);
    1.21 +	importer->package->properties =
    1.22 +		add_to_property_pool(&importer->set->property_pool,
    1.23 +				     &importer->properties);
    1.24  
    1.25  	array_release(&importer->properties);
    1.26  }
    1.27 @@ -699,13 +697,8 @@
    1.28  	set->properties.size = (void *) up - set->properties.data;
    1.29  	rp_end = up;
    1.30  	for (rp = set->properties.data, p = pkgs; rp < rp_end; rp++, p++) {
    1.31 -		if (p->size / sizeof *r == 1) {
    1.32 -			r = p->data;
    1.33 -			rp->packages = *r | RAZOR_IMMEDIATE;
    1.34 -		} else {
    1.35 -			rp->packages =
    1.36 -				add_to_property_pool(&set->package_pool, p);
    1.37 -		}
    1.38 +		rp->packages =
    1.39 +			add_to_property_pool(&set->package_pool, p);
    1.40  		array_release(p);
    1.41  	}
    1.42  
    1.43 @@ -754,7 +747,7 @@
    1.44  {
    1.45  	struct import_directory *p, *end;
    1.46  	struct razor_entry *e = NULL;
    1.47 -	uint32_t s, *r;
    1.48 +	uint32_t s;
    1.49  
    1.50  	p = d->files.data;
    1.51  	end = d->files.data + d->files.size;
    1.52 @@ -765,15 +758,8 @@
    1.53  		e->start = p->count > 0 ? s : 0;
    1.54  		s += p->count;
    1.55  
    1.56 -		if (p->packages.size == 0) {
    1.57 -			e->packages = ~0;
    1.58 -		} else if (p->packages.size / sizeof *r == 1) {
    1.59 -			r = p->packages.data;
    1.60 -			e->packages = *r | RAZOR_IMMEDIATE;
    1.61 -		} else {
    1.62 -			e->packages = add_to_property_pool(&set->package_pool,
    1.63 -							   &p->packages);
    1.64 -		}
    1.65 +		e->packages = add_to_property_pool(&set->package_pool,
    1.66 +						   &p->packages);
    1.67  		array_release(&p->packages);
    1.68  		p++;
    1.69  	}		
    1.70 @@ -1584,13 +1570,8 @@
    1.71  	prop_end = set->properties.data + set->properties.size;
    1.72  	a = pkgs;
    1.73  	for (prop = set->properties.data; prop < prop_end; prop++, a++) {
    1.74 -		if (a->size / sizeof *r == 1) {
    1.75 -			r = a->data;
    1.76 -			prop->packages = *r | RAZOR_IMMEDIATE;
    1.77 -		} else {
    1.78 -			prop->packages =
    1.79 -				add_to_property_pool(&set->property_pool, a);
    1.80 -		}
    1.81 +		prop->packages =
    1.82 +			add_to_property_pool(&set->property_pool, a);
    1.83  		array_release(a);
    1.84  	}
    1.85  	free(pkgs);