using yaz/log.h again

[idzebra-moved-to-github.git] / isamc / isamc.c

diff --git a/isamc/isamc.c b/isamc/isamc.c
index 0a0d53c..c1af1f0 100644 (file)
--- a/isamc/isamc.c
+++ b/isamc/isamc.c
@@ -1,4 +1,4 @@
-/* $Id: isamc.c,v 1.25 2004-08-04 08:35:24 adam Exp $
+/* $Id: isamc.c,v 1.28 2004-12-13 20:51:31 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -30,6 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdio.h>
 
 #include <yaz/log.h>
+#include <yaz/xmalloc.h>
 #include "isamc-p.h"
 
 static void flush_block (ISAMC is, int cat);
@@ -88,11 +89,11 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M *method)
 
     /* determine number of block categories */
     if (is->method->debug)
-        logf (LOG_LOG, "isc: bsize  ifill  mfill mblocks");
+        yaz_log (YLOG_LOG, "isc: bsize  ifill  mfill mblocks");
     do
     {
         if (is->method->debug)
-            logf (LOG_LOG, "isc:%6d %6d %6d %6d",
+            yaz_log (YLOG_LOG, "isc:%6d %6d %6d %6d",
                   filecat[i].bsize, filecat[i].ifill, 
                   filecat[i].mfill, filecat[i].mblocks);
         if (max_buf_size < filecat[i].mblocks * filecat[i].bsize)
@@ -105,7 +106,7 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M *method)
     if (max_buf_size < (1+is->method->max_blocks_mem) * filecat[i].bsize)
         max_buf_size = (1+is->method->max_blocks_mem) * filecat[i].bsize;
     if (is->method->debug)
-        logf (LOG_LOG, "isc: max_buf_size %d", max_buf_size);
+        yaz_log (YLOG_LOG, "isc: max_buf_size %d", max_buf_size);
     
     assert (is->no_files > 0);
     is->files = (ISAMC_file) xmalloc (sizeof(*is->files)*is->no_files);
@@ -174,9 +175,9 @@ int isc_close (ISAMC is)
 
     if (is->method->debug)
     {
-       logf (LOG_LOG, "isc:    next    forw   mid-f    prev   backw   mid-b");
+       yaz_log (YLOG_LOG, "isc:    next    forw   mid-f    prev   backw   mid-b");
        for (i = 0; i<is->no_files; i++)
-           logf (LOG_LOG, "isc:%8d%8d%8.1f%8d%8d%8.1f",
+           yaz_log (YLOG_LOG, "isc:%8d%8d%8.1f%8d%8d%8.1f",
                  is->files[i].no_next,
                  is->files[i].no_forward,
                  is->files[i].no_forward ?
@@ -189,7 +190,7 @@ int isc_close (ISAMC is)
                  : 0.0);
     }
     if (is->method->debug)
-        logf (LOG_LOG, "isc:  writes   reads skipped   alloc released  remap");
+        yaz_log (YLOG_LOG, "isc:  writes   reads skipped   alloc released  remap");
     for (i = 0; i<is->no_files; i++)
     {
         release_fc (is, i);
@@ -198,7 +199,7 @@ int isc_close (ISAMC is)
             bf_write (is->files[i].bf, 0, 0, sizeof(ISAMC_head),
                  &is->files[i].head);
         if (is->method->debug)
-            logf (LOG_LOG, "isc:%8d%8d%8d%8d%8d%8d",
+            yaz_log (YLOG_LOG, "isc:%8d%8d%8d%8d%8d%8d",
                   is->files[i].no_writes,
                   is->files[i].no_reads,
                   is->files[i].no_skip_writes,
@@ -226,7 +227,7 @@ int isc_write_block (ISAMC is, int cat, zint pos, char *src)
 {
     ++(is->files[cat].no_writes);
     if (is->method->debug > 2)
-        logf (LOG_LOG, "isc: write_block %d " ZINT_FORMAT, cat, pos);
+        yaz_log (YLOG_LOG, "isc: write_block %d " ZINT_FORMAT, cat, pos);
     return bf_write (is->files[cat].bf, pos, 0, 0, src);
 }
 
@@ -235,7 +236,7 @@ int isc_write_dblock (ISAMC is, int cat, zint pos, char *src,
 {
     ISAMC_BLOCK_SIZE size = offset + ISAMC_BLOCK_OFFSET_N;
     if (is->method->debug > 2)
-        logf (LOG_LOG, "isc: write_dblock. size=%d nextpos=" ZINT_FORMAT,
+        yaz_log (YLOG_LOG, "isc: write_dblock. size=%d nextpos=" ZINT_FORMAT,
               (int) size, nextpos);
     src -= ISAMC_BLOCK_OFFSET_N;
     memcpy (src, &nextpos, sizeof(nextpos));
@@ -394,14 +395,14 @@ zint isc_alloc_block (ISAMC is, int cat)
     if (!block)
         block = alloc_block (is, cat);
     if (is->method->debug > 3)
-        logf (LOG_LOG, "isc: alloc_block in cat %d: " ZINT_FORMAT, cat, block);
+        yaz_log (YLOG_LOG, "isc: alloc_block in cat %d: " ZINT_FORMAT, cat, block);
     return block;
 }
 
 void isc_release_block (ISAMC is, int cat, zint pos)
 {
     if (is->method->debug > 3)
-        logf (LOG_LOG, "isc: release_block in cat %d:" ZINT_FORMAT, cat, pos);
+        yaz_log (YLOG_LOG, "isc: release_block in cat %d:" ZINT_FORMAT, cat, pos);
     if (is->files[cat].fc_list)
     {
         int j;
@@ -420,7 +421,7 @@ static void init_fc (ISAMC is, int cat)
     int j = 100;
         
     is->files[cat].fc_max = j;
-    is->files[cat].fc_list = (int *)
+    is->files[cat].fc_list = (zint *)
        xmalloc (sizeof(*is->files[0].fc_list) * j);
     while (--j >= 0)
         is->files[cat].fc_list[j] = 0;
@@ -428,7 +429,8 @@ static void init_fc (ISAMC is, int cat)
 
 static void release_fc (ISAMC is, int cat)
 {
-    int b, j = is->files[cat].fc_max;
+    int j = is->files[cat].fc_max;
+    zint b;
 
     while (--j >= 0)
         if ((b = is->files[cat].fc_list[j]))
@@ -452,7 +454,7 @@ ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos)
     ISAMC_PP pp = (ISAMC_PP) xmalloc (sizeof(*pp));
     char *src;
    
-    pp->cat = isc_type(ipos);
+    pp->cat = (int) isc_type(ipos);
     pp->pos = isc_block(ipos); 
 
     src = pp->buf = (char *) xmalloc (is->method->filecat[pp->cat].bsize);
@@ -477,14 +479,14 @@ ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos)
         src += sizeof(pp->numKeys);
        if (pp->next == pp->pos)
        {
-           yaz_log(LOG_FATAL|LOG_LOG, "pp->next = " ZINT_FORMAT, pp->next);
-           yaz_log(LOG_FATAL|LOG_LOG, "pp->pos = " ZINT_FORMAT, pp->pos);
+           yaz_log(YLOG_FATAL|YLOG_LOG, "pp->next = " ZINT_FORMAT, pp->next);
+           yaz_log(YLOG_FATAL|YLOG_LOG, "pp->pos = " ZINT_FORMAT, pp->pos);
            assert (pp->next != pp->pos);
        }
         pp->offset = src - pp->buf; 
         assert (pp->offset == ISAMC_BLOCK_OFFSET_1);
         if (is->method->debug > 2)
-            logf (LOG_LOG, "isc: read_block size=%d %d " ZINT_FORMAT " next="
+            yaz_log (YLOG_LOG, "isc: read_block size=%d %d " ZINT_FORMAT " next="
                  ZINT_FORMAT, pp->size, pp->cat, pp->pos, pp->next);
     }
     return pp;
@@ -548,8 +550,8 @@ int isc_read_item (ISAMC_PP pp, char **dst)
 
        if (pp->next == pp->pos)
        {
-           yaz_log(LOG_FATAL|LOG_LOG, "pp->next = " ZINT_FORMAT, pp->next);
-           yaz_log(LOG_FATAL|LOG_LOG, "pp->pos = " ZINT_FORMAT, pp->pos);
+           yaz_log(YLOG_FATAL|YLOG_LOG, "pp->next = " ZINT_FORMAT, pp->next);
+           yaz_log(YLOG_FATAL|YLOG_LOG, "pp->pos = " ZINT_FORMAT, pp->pos);
            assert (pp->next != pp->pos);
        }
 
@@ -558,7 +560,7 @@ int isc_read_item (ISAMC_PP pp, char **dst)
         (*is->method->codec.decode)(pp->decodeClientData, dst, &src);
         pp->offset = src - pp->buf; 
         if (is->method->debug > 2)
-            logf (LOG_LOG, "isc: read_block size=%d %d " ZINT_FORMAT " next="
+            yaz_log (YLOG_LOG, "isc: read_block size=%d %d " ZINT_FORMAT " next="
                  ZINT_FORMAT, pp->size, pp->cat, pp->pos, pp->next);
         return 2;
     }