#ifdef GCCACHE_HASH
static unsigned long
-gc_cache_hash (CONST void *arg)
+gc_cache_hash (const void *arg)
{
- CONST struct gcv_and_mask *gcvm = (CONST struct gcv_and_mask *) arg;
+ const struct gcv_and_mask *gcvm = (const struct gcv_and_mask *) arg;
unsigned long *longs = (unsigned long *) &gcvm->gcv;
unsigned long hash = gcvm->mask;
- int i;
+ size_t i;
/* This could look at the mask and only use the used slots in the
hash code. That would win in that we wouldn't have to initialize
every slot of the gcv when calling gc_cache_lookup. But we need
#endif /* GCCACHE_HASH */
static int
-gc_cache_eql (CONST void *arg1, CONST void *arg2)
+gc_cache_eql (const void *arg1, const void *arg2)
{
/* See comment in gc_cache_hash */
return !memcmp (arg1, arg2, sizeof (struct gcv_and_mask));
struct gc_cache_cell *cell, *next, *prev;
struct gcv_and_mask gcvm;
- if ((!!cache->head) != (!!cache->tail)) abort ();
- if (cache->head && (cache->head->prev || cache->tail->next)) abort ();
+ if ((!!cache->head) != (!!cache->tail)) ABORT ();
+ if (cache->head && (cache->head->prev || cache->tail->next)) ABORT ();
gcvm.mask = mask;
gcvm.gcv = *gcv; /* this copies... */
#ifdef GCCACHE_HASH
- if (gethash (&gcvm, cache->table, (CONST void **) &cell))
+ if (gethash (&gcvm, cache->table, (const void **) &cell))
#else /* !GCCACHE_HASH */
cell->prev = cache->tail;
cache->tail->next = cell;
cache->tail = cell;
- if (cache->head == cell) abort ();
- if (cell->next) abort ();
- if (cache->head->prev) abort ();
- if (cache->tail->next) abort ();
+ if (cache->head == cell) ABORT ();
+ if (cell->next) ABORT ();
+ if (cache->head->prev) ABORT ();
+ if (cache->tail->next) ABORT ();
return cell->gc;
}
#endif
}
else if (cache->size > GC_CACHE_SIZE)
- abort ();
+ ABORT ();
else
{
/* Allocate a new cell (don't put it in the list or table yet). */