X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=bfile%2Fcommit.c;h=a4dacda1ef102bbd63535360e5bd2f925d58a2f7;hp=57276792006f35fd4aa70041fc18bc13398f0ba2;hb=4478d785b7769691261005c98063b98a5a5971b3;hpb=896c0427df9d8eff5de6a1735dcd992e067df844

diff --git a/bfile/commit.c b/bfile/commit.c
index 5727679..a4dacda 100644
--- a/bfile/commit.c
+++ b/bfile/commit.c
@@ -1,6 +1,6 @@
-/* $Id: commit.c,v 1.16 2002-08-02 19:26:55 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: commit.c,v 1.28 2006-08-14 10:40:05 adam Exp $
+   Copyright (C) 1995-2006
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -15,27 +15,27 @@ 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.
-*/
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+*/
 
 
 #include <assert.h>
 #include <stdlib.h>
 
-#include <zebrautl.h>
-#include <mfile.h>
+#include <idzebra/util.h>
+#include <yaz/xmalloc.h>
+#include "mfile.h"
 #include "cfile.h"
 
 #define CF_OPTIMIZE_COMMIT 0
 
-void cf_unlink (CFile cf)
+void cf_unlink(CFile cf)
 {
     if (cf->bucket_in_memory)
     {
-        logf (LOG_FATAL, "Cannot unlink potential dirty cache");
+        yaz_log (YLOG_FATAL, "Cannot unlink potential dirty cache");
         exit (1);
     }
     cf->head.state = 0;
@@ -97,7 +97,7 @@ static void map_cache_flush (struct map_cache *m_p)
         if (!mf_read (m_p->cf->block_mf, m_p->map[i].from, 0, 0,
                       m_p->buf + i * m_p->cf->head.block_size))
         {
-            logf (LOG_FATAL, "read commit block at position %d",
+            yaz_log (YLOG_FATAL, "read commit block at position %d",
                   m_p->map[i].from);
             exit (1);
         }
@@ -137,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
@@ -149,13 +150,13 @@ static void cf_commit_hash (CFile cf)
 #endif
 
     p = (struct CFile_ph_bucket *) xmalloc (sizeof(*p));
-    hash_bytes = cf->head.hash_size * sizeof(int);
+    hash_bytes = cf->head.hash_size * sizeof(zint);
     bucket_no = cf->head.first_bucket;
     for (; bucket_no < cf->head.next_bucket; bucket_no++)
     {
         if (!mf_read (cf->hash_mf, bucket_no, 0, 0, p))
         {
-            logf (LOG_FATAL, "read commit hash");
+            yaz_log (YLOG_FATAL, "read commit hash");
             exit (1);
         }
         for (i = 0; i<HASH_BUCKET && p->vno[i]; i++)
@@ -165,7 +166,7 @@ static void cf_commit_hash (CFile cf)
 #else
             if (!mf_read (cf->block_mf, p->vno[i], 0, 0, cf->iobuf))
             {
-                logf (LOG_FATAL, "read commit block");
+                yaz_log (YLOG_FATAL, "read commit block");
                 exit (1);
             }
             mf_write (cf->rmf, p->no[i], 0, 0, cf->iobuf);
@@ -180,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;
@@ -192,18 +194,19 @@ static void cf_commit_flat (CFile cf)
 #if CF_OPTIMIZE_COMMIT
     m_p = map_cache_init (cf);
 #endif
-    fp = (int *) xmalloc (HASH_BSIZE);
+    fp = (zint *) xmalloc (HASH_BSIZE);
     for (hno = cf->head.next_bucket; hno < cf->head.flat_bucket; hno++)
     {
-	for (i = 0; i < (int) (HASH_BSIZE/sizeof(int)); i++)
+	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",
+            yaz_log (YLOG_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 < (int) (HASH_BSIZE/sizeof(int)); i++)
+        for (i = 0; i < (int) (HASH_BSIZE/sizeof(zint)); i++)
         {
             if (fp[i])
             {
@@ -212,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)",
+                    yaz_log (YLOG_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);
@@ -236,7 +239,7 @@ void cf_commit (CFile cf)
 
     if (cf->bucket_in_memory)
     {
-        logf (LOG_FATAL, "Cannot commit potential dirty cache");
+        yaz_log (YLOG_FATAL, "Cannot commit potential dirty cache");
         exit (1);
     }
     if (cf->head.state == 1)
@@ -245,3 +248,11 @@ void cf_commit (CFile cf)
         cf_commit_flat (cf);
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+