Fix term counters to be of type zint. Fix several printfs of zint.

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

diff --git a/isamc/merge.c b/isamc/merge.c
index 5b5669f..c816766 100644 (file)
--- a/isamc/merge.c
+++ b/isamc/merge.c
@@ -1,4 +1,4 @@
-/* $Id: merge.c,v 1.24 2004-08-04 08:35:24 adam Exp $
+/* $Id: merge.c,v 1.26 2004-08-06 12:55:02 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -135,8 +135,8 @@ static void flush_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
     }
 }
 
-static int get_border (ISAMC is, struct isc_merge_block *mb, int ptr,
-                       int cat, int firstpos)
+static int get_border (ISAMC is, struct isc_merge_block *mb, zint ptr,
+                       int cat, zint firstpos)
 {
    /* Border set to initial fill or block size depending on
       whether we are creating a new one or updating and old one.
@@ -172,7 +172,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data)
     int r_offset = 0;     /* current offset in r_buf */
     int ptr = 0;          /* pointer */
     void *r_clientData;   /* encode client data */
-    int border;
+    zint border;
     zint numKeys = 0;
 
     r_clientData = (*is->method->codec.start)();
@@ -345,7 +345,8 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data)
             if (border < new_offset && border >= r_offset)
             {
                 if (debug > 2)
-                    logf (LOG_LOG, "isc: border %d %d", ptr, border);
+                    logf (LOG_LOG, "isc: border %d " ZINT_FORMAT,
+                         ptr, border);
                 /* Max size of current block category reached ...
                    make new virtual block entry */
                 mb[++ptr].block = 0;
@@ -421,7 +422,8 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data)
             ptr = j;
             border = get_border (is, mb, ptr, cat, firstpos);
            if (debug > 3)
-               logf (LOG_LOG, "isc: border=%d r_offset=%d", border, r_offset);
+               logf (LOG_LOG, "isc: border=" ZINT_FORMAT " r_offset=%d",
+                     border, r_offset);
         }
     }
     if (mb[ptr].offset < r_offset)