Disable shared objects by default

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

diff --git a/index/trunc.c b/index/trunc.c
index 6a5f5bb..95f297f 100644 (file)
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,4 +1,4 @@
-/* $Id: trunc.c,v 1.37 2004-08-24 14:25:16 heikki Exp $
+/* $Id: trunc.c,v 1.39 2004-08-25 09:18:06 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -24,17 +24,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdio.h>
 #include <assert.h>
 
-#define NEW_TRUNC 1
-
 #include "index.h"
 #include <rstemp.h>
 #include <rsnull.h>
 #include <rsisams.h>
 #include <rsisamc.h>
 #include <rsisamb.h>
-#if NEW_TRUNC
-#include <rsm_or.h>
-#endif
 #include <rsmultior.h>
 
 struct trunc_info {
@@ -487,15 +482,18 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
 #if 1
         else if (no <10000 ) /* FIXME - hardcoded number */
         {
+            RSET r;
             RSET *rsets=xmalloc(no*sizeof(RSET)); /* use nmem! */
             int i;
             for (i=0;i<no;i++)
                 rsets[i]=rsisamb_create(NULL, /* */
                     sizeof(struct it_key), key_compare_it,
                     zi->reg->isamb, isam_p[i] );
-            return rsmultior_create( NULL, /* FIXME - use some nmem */
+            r=rsmultior_create( NULL, /* FIXME - use some nmem */
                       sizeof(struct it_key), key_compare_it, 
                       no, rsets);
+            xfree(rsets);
+            return r;
             /*
             rset_multior_parms m_parms;
             rset_isamb_parms b_parms;