void *hashvector_next(hashvector *hv,vector_index *index,void *key) {
unsigned long i = index? *index : 0;
for ( ; i < hv->table.size; i++ ) {
- void **p = hashvector_find_slot( hv, key, &i, 0 );
+ void **p = vector_next_used( &hv->table, &i );
if ( p == 0 ) {
break;
}
if ( *p && *p != HV_HOLE ) {
- if ( key && hv->type->haskey( hv->type, key, *p ) == 0 ) {
+ if ( key && hv->type->haskey( hv->type, *p, key ) == 0 ) {
continue;
}
if ( index ) {
return 1;
}
-// Copy items into a vector. Returns 0 on success and -1 on failure.
-int hashvector_contents(hashvector *hv,vector *pv) {
- if ( vector_resize( pv, hv->fill, 0, 0 ) ) {
- return -1;
- }
- unsigned long from = 0;
- unsigned long to = 0;
- for ( ; to < hv->fill; from++ ) {
- void **slot = vector_next_used( &hv->table, &from );
- if ( slot == 0 ) {
- break;
- }
- if ( *slot != HV_HOLE ) {
- vector_set( pv, to++, *slot );
+vector *hashvector_contents(
+ hashvector *hv,enum vector_variant variant,vector *v)
+{
+ if ( v == 0 ) {
+ if ( hv->fill == 0 ) {
+ return 0;
}
+ v = (vector*) malloc( sizeof( vector ) );
+ } else {
+ vector_resize( v, 0, vector_clear_any, 0 );
}
- return 0;
+ (*v) = (vector) { .variant = variant, 0, 0 };
+ if ( hv->fill == 0 ) {
+ return v;
+ }
+ vector_resize( v, hv->fill, 0, 0 );
+ vector_index i;
+ vector_index j = 0;
+ for ( i = 0; i < v->size; i++, j++ ) {
+ vector_set( v, i, hashvector_next( hv, &j, 0 ) );
+ }
+ return v;
}
// A simple binary hashcode, (before modulo table size)