(g2-UU+5B73): Add `=decomposition@hanyo-denshi'.

[chise/xemacs-chise.git.1] / src / xgccache.c

diff --git a/src/xgccache.c b/src/xgccache.c
index 7a21c5c..101e4fc 100644 (file)
--- a/src/xgccache.c
+++ b/src/xgccache.c
@@ -98,7 +98,7 @@ gc_cache_hash (const void *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;
   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
   /* 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

@@ -158,8 +158,8 @@ gc_cache_lookup (struct gc_cache *cache, XGCValues *gcv, unsigned long mask)
   struct gc_cache_cell *cell, *next, *prev;
   struct gcv_and_mask gcvm;
 
   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... */
 
   gcvm.mask = mask;
   gcvm.gcv = *gcv;     /* this copies... */

@@ -206,10 +206,10 @@ gc_cache_lookup (struct gc_cache *cache, XGCValues *gcv, unsigned long mask)
       cell->prev = cache->tail;
       cache->tail->next = cell;
       cache->tail = cell;
       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;
     }
 
       return cell->gc;
     }
 

@@ -231,7 +231,7 @@ gc_cache_lookup (struct gc_cache *cache, XGCValues *gcv, unsigned long mask)
 #endif
     }
   else if (cache->size > GC_CACHE_SIZE)
 #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). */
   else
     {
       /* Allocate a new cell (don't put it in the list or table yet). */