X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fcommit.c;h=9182537c1d56d52ba43e80750f3557d86924e01b;hb=12c6db025bffd23e760ceb31120468cf363256df;hp=cf8affff43d3a4b8f063b8af2380562e27b836e2;hpb=e127268c91736bf5a116cbc24653da4b845ca046;p=idzebra-moved-to-github.git

diff --git a/bfile/commit.c b/bfile/commit.c
index cf8afff..9182537 100644
--- a/bfile/commit.c
+++ b/bfile/commit.c
@@ -1,52 +1,26 @@
-/*
- * Copyright (C) 1995, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: commit.c,v $
- * 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
- * Work on optimized on commit operation.
- *
- * Revision 1.11  1996/04/23  12:36:41  adam
- * Started work on more efficient commit operation.
- *
- * Revision 1.10  1996/04/18  16:02:56  adam
- * Changed logging a bit.
- * Removed warning message when commiting flat shadow files.
- *
- * Revision 1.9  1996/04/12  07:01:57  adam
- * Yet another bug fix (next_block was initialized to 0; now set to 1).
- *
- * Revision 1.8  1996/02/07 14:03:49  adam
- * Work on flat indexed shadow files.
- *
- * Revision 1.7  1996/02/07  10:08:46  adam
- * Work on flat shadow (not finished yet).
- *
- * Revision 1.6  1995/12/15  12:36:53  adam
- * Moved hash file information to union.
- * Renamed commit files.
- *
- * Revision 1.5  1995/12/12  15:57:55  adam
- * Implemented mf_unlink. cf_unlink uses mf_unlink.
- *
- * Revision 1.4  1995/12/11  09:03:55  adam
- * New function: cf_unlink.
- * New member of commit file head: state (0) deleted, (1) hash file.
- *
- * Revision 1.3  1995/12/01  16:24:29  adam
- * Commit files use separate meta file area.
- *
- * Revision 1.2  1995/12/01  11:37:24  adam
- * Cached/commit files implemented as meta-files.
- *
- * Revision 1.1  1995/11/30  08:33:13  adam
- * Started work on commit facility.
- *
- */
+/* $Id: commit.c,v 1.20 2004-09-13 08:43:28 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 
 #include <assert.h>
 #include <stdlib.h>
@@ -163,7 +137,8 @@ static void map_cache_add (struct map_cache *m_p, int from, int to)
 
 static void cf_commit_hash (CFile cf)
 { 
-    int i, bucket_no;
+    int i;
+    zint bucket_no;
     int hash_bytes;
     struct CFile_ph_bucket *p;
 #if CF_OPTIMIZE_COMMIT
@@ -174,8 +149,8 @@ static void cf_commit_hash (CFile cf)
     m_p = map_cache_init (cf);
 #endif
 
-    p = xmalloc (sizeof(*p));
-    hash_bytes = cf->head.hash_size * sizeof(int);
+    p = (struct CFile_ph_bucket *) xmalloc (sizeof(*p));
+    hash_bytes = cf->head.hash_size * sizeof(zint);
     bucket_no = cf->head.first_bucket;
     for (; bucket_no < cf->head.next_bucket; bucket_no++)
     {
@@ -206,9 +181,10 @@ static void cf_commit_hash (CFile cf)
 
 static void cf_commit_flat (CFile cf)
 {
-    int *fp;
-    int hno;
-    int i, vno = 0;
+    zint *fp;
+    zint hno;
+    int i;
+    zint vno = 0;
 
 #if CF_OPTIMIZE_COMMIT
     struct map_cache *m_p;
@@ -218,21 +194,19 @@ static void cf_commit_flat (CFile cf)
 #if CF_OPTIMIZE_COMMIT
     m_p = map_cache_init (cf);
 #endif
-    fp = xmalloc (HASH_BSIZE);
+    fp = (zint *) 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(zint)); 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",
+            logf (LOG_FATAL, "read index block hno=" ZINT_FORMAT
+		  " (" ZINT_FORMAT "-" ZINT_FORMAT ") 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(zint)); i++)
         {
             if (fp[i])
             {
@@ -241,8 +215,8 @@ static void cf_commit_flat (CFile cf)
 #else
                 if (!mf_read (cf->block_mf, fp[i], 0, 0, cf->iobuf))
                 {
-                    logf (LOG_FATAL, "read data block hno=%d (%d-%d) "
-                                     "i=%d commit block at %d (->%d)",
+                    logf (LOG_FATAL, "read data block hno=" ZINT_FORMAT " (" ZINT_FORMAT "-" ZINT_FORMAT ") "
+                                     "i=%d commit block at " ZINT_FORMAT " (->" ZINT_FORMAT")",
                           hno, cf->head.next_bucket, cf->head.flat_bucket-1,
                           i, fp[i], vno);
                     exit (1);