C++ compilation.

[idzebra-moved-to-github.git] / bfile / commit.c

diff --git a/bfile/commit.c b/bfile/commit.c
index cf8afff..ee95df3 100644 (file)
--- a/bfile/commit.c
+++ b/bfile/commit.c
@@ -1,10 +1,16 @@
 /*
- * Copyright (C) 1995, Index Data I/S 
+ * Copyright (C) 1995-1998, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: commit.c,v $
- * Revision 1.13  1996-10-29 13:56:16  adam
+ * Revision 1.15  1999-05-26 07:49:12  adam
+ * C++ compilation.
+ *
+ * Revision 1.14  1998/08/07 15:07:16  adam
+ * Fixed but in cf_commit_flat.
+ *
+ * Revision 1.13  1996/10/29 13:56:16  adam
  * Include of zebrautl.h instead of alexutil.h.
  *
  * Revision 1.12  1996/04/24 13:29:16  adam
@@ -174,7 +180,7 @@ static void cf_commit_hash (CFile cf)
     m_p = map_cache_init (cf);
 #endif
 
-    p = xmalloc (sizeof(*p));
+    p = (struct CFile_ph_bucket *) xmalloc (sizeof(*p));
     hash_bytes = cf->head.hash_size * sizeof(int);
     bucket_no = cf->head.first_bucket;
     for (; bucket_no < cf->head.next_bucket; bucket_no++)
@@ -218,21 +224,18 @@ static void cf_commit_flat (CFile cf)
 #if CF_OPTIMIZE_COMMIT
     m_p = map_cache_init (cf);
 #endif
-    fp = xmalloc (HASH_BSIZE);
+    fp = (int *) xmalloc (HASH_BSIZE);
     for (hno = cf->head.next_bucket; hno < cf->head.flat_bucket; hno++)
     {
-        if (hno == cf->head.flat_bucket-1)
-        {
-            for (i = 0; i < (HASH_BSIZE/sizeof(int)); i++)
-                fp[i] = 0;
-        }
+       for (i = 0; i < (int) (HASH_BSIZE/sizeof(int)); i++)
+           fp[i] = 0;
         if (!mf_read (cf->hash_mf, hno, 0, 0, fp) &&
             hno != cf->head.flat_bucket-1)
         {
             logf (LOG_FATAL, "read index block hno=%d (%d-%d) commit",
                   hno, cf->head.next_bucket, cf->head.flat_bucket-1);
         }
-        for (i = 0; i < (HASH_BSIZE/sizeof(int)); i++)
+        for (i = 0; i < (int) (HASH_BSIZE/sizeof(int)); i++)
         {
             if (fp[i])
             {