WIN32 compile fix

[idzebra-moved-to-github.git] / index / trunc.c

diff --git a/index/trunc.c b/index/trunc.c
index 59ad378..9dc70af 100644 (file)
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,6 +1,6 @@
-/* $Id: trunc.c,v 1.49 2004-11-19 10:27:03 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: trunc.c,v 1.52 2005-04-13 13:03:47 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -91,19 +91,19 @@ static struct trunc_info *heap_init (int size, int key_size,
                                     int (*cmp)(const void *p1,
                                                const void *p2))
 {
-    struct trunc_info *ti = (struct trunc_info *) xmalloc (sizeof(*ti));
+    struct trunc_info *ti = (struct trunc_info *) xmalloc(sizeof(*ti));
     int i;
 
     ++size;
     ti->heapnum = 0;
     ti->keysize = key_size;
     ti->cmp = cmp;
-    ti->indx = (int *) xmalloc (size * sizeof(*ti->indx));
-    ti->heap = (char **) xmalloc (size * sizeof(*ti->heap));
-    ti->ptr = (int *) xmalloc (size * sizeof(*ti->ptr));
-    ti->swapbuf = (char *) xmalloc (ti->keysize);
-    ti->tmpbuf = (char *) xmalloc (ti->keysize);
-    ti->buf = (char *) xmalloc (size * ti->keysize);
+    ti->indx = (int *) xmalloc(size * sizeof(*ti->indx));
+    ti->heap = (char **) xmalloc(size * sizeof(*ti->heap));
+    ti->ptr = (int *) xmalloc(size * sizeof(*ti->ptr));
+    ti->swapbuf = (char *) xmalloc(ti->keysize);
+    ti->tmpbuf = (char *) xmalloc(ti->keysize);
+    ti->buf = (char *) xmalloc(size * ti->keysize);
     for (i = size; --i >= 0; )
     {
         ti->ptr[i] = i;
@@ -114,21 +114,21 @@ static struct trunc_info *heap_init (int size, int key_size,
 
 static void heap_close (struct trunc_info *ti)
 {
-    xfree (ti->ptr);
-    xfree (ti->indx);
-    xfree (ti->heap);
-    xfree (ti->swapbuf);
-    xfree (ti->tmpbuf);
-    xfree (ti->buf);
-    xfree (ti);
+    xfree(ti->ptr);
+    xfree(ti->indx);
+    xfree(ti->heap);
+    xfree(ti->swapbuf);
+    xfree(ti->tmpbuf);
+    xfree(ti->buf);
+    xfree(ti);
 }
 
-static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
-                          const char *flags, ISAMS_P *isam_p, int from, int to,
-                          int merge_chunk, int preserve_position,
-                          int term_type, NMEM rset_nmem,
-                          const struct key_control *kctrl, int scope,
-                          TERMID termid)
+static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
+                         const char *flags, ISAM_P *isam_p, int from, int to,
+                        int merge_chunk, int preserve_position,
+                        int term_type, NMEM rset_nmem,
+                        const struct key_control *kctrl, int scope,
+                        TERMID termid)
 {
     RSET result; 
     RSFD result_rsfd;
@@ -141,7 +141,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
     parms.temp_path = res_get (zi->res, "setTmpDir");
     result = rset_create (rset_kind_temp, &parms);
     */
-    result=rstemp_create( rset_nmem,kctrl, scope,
+    result = rstemp_create( rset_nmem,kctrl, scope,
             res_get (zi->res, "setTmpDir"), termid);
     result_rsfd = rset_open (result, RSETF_WRITE);
 
@@ -154,8 +154,8 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         int rscur = 0;
         int rsmax = (to-from)/i_add + 1;
         
-        rset = (RSET *) xmalloc (sizeof(*rset) * rsmax);
-        rsfd = (RSFD *) xmalloc (sizeof(*rsfd) * rsmax);
+        rset = (RSET *) xmalloc(sizeof(*rset) * rsmax);
+        rsfd = (RSFD *) xmalloc(sizeof(*rsfd) * rsmax);
         
         for (i = from; i < to; i += i_add)
         {
@@ -209,8 +209,8 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
                 }
             }
         }
-        xfree (rset);
-        xfree (rsfd);
+        xfree(rset);
+        xfree(rsfd);
         heap_close (ti);
     }
     else if (zi->reg->isamc)
@@ -219,17 +219,17 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         int i;
         struct trunc_info *ti;
 
-        ispt = (ISAMC_PP *) xmalloc (sizeof(*ispt) * (to-from));
+        ispt = (ISAMC_PP *) xmalloc(sizeof(*ispt) * (to-from));
 
         ti = heap_init (to-from, sizeof(struct it_key),
                         key_compare_it);
         for (i = to-from; --i >= 0; )
         {
-            ispt[i] = isc_pp_open (zi->reg->isamc, isam_p[from+i]);
-            if (isc_pp_read (ispt[i], ti->tmpbuf))
+            ispt[i] = isamc_pp_open (zi->reg->isamc, isam_p[from+i]);
+            if (isamc_pp_read (ispt[i], ti->tmpbuf))
                 heap_insert (ti, ti->tmpbuf, i);
             else
-                isc_pp_close (ispt[i]);
+                isamc_pp_close (ispt[i]);
         }
         while (ti->heapnum)
         {
@@ -240,19 +240,19 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
             if (preserve_position)
             {
                 heap_delete (ti);
-                if (isc_pp_read (ispt[n], ti->tmpbuf))
+                if (isamc_pp_read (ispt[n], ti->tmpbuf))
                     heap_insert (ti, ti->tmpbuf, n);
                 else
-                    isc_pp_close (ispt[n]);
+                    isamc_pp_close (ispt[n]);
             }
             else
             {
                 while (1)
                 {
-                    if (!isc_pp_read (ispt[n], ti->tmpbuf))
+                    if (!isamc_pp_read (ispt[n], ti->tmpbuf))
                     {
                         heap_delete (ti);
-                        isc_pp_close (ispt[n]);
+                        isamc_pp_close (ispt[n]);
                         break;
                     }
                     if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1)
@@ -265,7 +265,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
             }
         }
         heap_close (ti);
-        xfree (ispt);
+        xfree(ispt);
     }
     else if (zi->reg->isams)
     {
@@ -274,7 +274,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         struct trunc_info *ti;
         int nn = 0;
 
-        ispt = (ISAMS_PP *) xmalloc (sizeof(*ispt) * (to-from));
+        ispt = (ISAMS_PP *) xmalloc(sizeof(*ispt) * (to-from));
 
         ti = heap_init (to-from, sizeof(struct it_key),
                         key_compare_it);
@@ -309,7 +309,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
             }
         }
         heap_close (ti);
-        xfree (ispt);
+        xfree(ispt);
     }
     else if (zi->reg->isamb)
     {
@@ -317,7 +317,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         int i;
         struct trunc_info *ti;
 
-        ispt = (ISAMB_PP *) xmalloc (sizeof(*ispt) * (to-from));
+        ispt = (ISAMB_PP *) xmalloc(sizeof(*ispt) * (to-from));
 
         ti = heap_init (to-from, sizeof(struct it_key),
                         key_compare_it);
@@ -366,7 +366,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
             }
         }
         heap_close (ti);
-        xfree (ispt);
+        xfree(ispt);
     }
     else
         yaz_log (YLOG_WARN, "Unknown isam set in rset_trunc_r");
@@ -377,8 +377,8 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
 
 static int isams_trunc_cmp (const void *p1, const void *p2)
 {
-    ISAMS_P i1 = *(ISAMS_P*) p1;
-    ISAMS_P i2 = *(ISAMS_P*) p2;
+    ISAM_P i1 = *(ISAM_P*) p1;
+    ISAM_P i2 = *(ISAM_P*) p2;
 
     if (i1 > i2)
         return 1;
@@ -389,13 +389,13 @@ static int isams_trunc_cmp (const void *p1, const void *p2)
 
 static int isamc_trunc_cmp (const void *p1, const void *p2)
 {
-    ISAMC_P i1 = *(ISAMC_P*) p1;
-    ISAMC_P i2 = *(ISAMC_P*) p2;
+    ISAM_P i1 = *(ISAM_P*) p1;
+    ISAM_P i2 = *(ISAM_P*) p2;
     zint d;
 
-    d = (isc_type (i1) - isc_type (i2));
+    d = (isamc_type (i1) - isamc_type (i2));
     if (d == 0)
-        d = isc_block (i1) - isc_block (i2);
+        d = isamc_block (i1) - isamc_block (i2);
     if (d > 0)
        return 1;
     else if (d < 0)
@@ -403,7 +403,7 @@ static int isamc_trunc_cmp (const void *p1, const void *p2)
     return 0;
 }
 
-RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
+RSET rset_trunc (ZebraHandle zi, ISAM_P *isam_p, int no,
                 const char *term, int length, const char *flags,
                  int preserve_position, int term_type, NMEM rset_nmem,
                  const struct key_control *kctrl, int scope)
@@ -412,7 +412,7 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
     yaz_log (YLOG_DEBUG, "rset_trunc no=%d", no);
     if (no < 1)
        return rsnull_create (rset_nmem,kctrl);
-    termid=rset_term_create(term, length, flags, term_type,rset_nmem);
+    termid = rset_term_create(term, length, flags, term_type,rset_nmem);
     if (zi->reg->isams)
     {
         if (no == 1)
@@ -435,12 +435,12 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
         else if (no <10000 ) /* FIXME - hardcoded number */
         {
             RSET r;
-            RSET *rsets=xmalloc(no*sizeof(RSET)); /* use nmem! */
+            RSET *rsets = xmalloc(no*sizeof(RSET)); /* use nmem! */
             int i;
-            for (i=0;i<no;i++)
+            for (i = 0; i<no; i++)
                 rsets[i]=rsisamb_create(rset_nmem, kctrl, scope,
                     zi->reg->isamb, isam_p[i], termid);
-            r=rsmultior_create( rset_nmem, kctrl, scope, no, rsets);
+            r = rsmulti_or_create( rset_nmem, kctrl, scope, no, rsets);
             xfree(rsets);
             return r;
         }