From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 5 Mar 2003 16:41:10 +0000 (+0000)
Subject: Fix GCC warnings
X-Git-Tag: ZEBRA.1.3.8~29
X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=671b306a76625f84b890d4356a4b38394404c4e3

Fix GCC warnings
---

diff --git a/isamc/isamd.c b/isamc/isamd.c
index 1ff4ae1..21d90a9 100644
--- a/isamc/isamd.c
+++ b/isamc/isamd.c
@@ -1,4 +1,4 @@
-/* $Id: isamd.c,v 1.24 2002-11-26 22:18:34 adam Exp $
+/* $Id: isamd.c,v 1.25 2003-03-05 16:41:10 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -601,10 +601,6 @@ ISAMD_PP isamd_pp_open (ISAMD is, const char *dictbuf, int dictlen)
     char *src;
     int sz = is->method->filecat[is->max_cat].bsize;
                  /* always allocate for the largest blocks, saves trouble */
-    struct it_key singlekey;
-    char *c_ptr; /* for fake encoding the singlekey */
-    char *i_ptr;
-    int ofs;
     int dictnum;
     
     pp->numKeys = 0;
@@ -798,6 +794,8 @@ int isamd_pp_num (ISAMD_PP pp)
     return pp->numKeys;
 }
 
+#if 0
+/* for testing .. */
 static char *hexdump(unsigned char *p, int len, char *buff) {
   static char localbuff[128];
   char bytebuff[8];
@@ -811,7 +809,7 @@ static char *hexdump(unsigned char *p, int len, char *buff) {
   }
   return buff;
 }
-
+#endif
 
 #ifdef SKIPTHIS
   /* needs different arguments, or something */
@@ -881,7 +879,10 @@ void isamd_pp_dump (ISAMD is, ISAMD_P ipos)
 
 /*
  * $Log: isamd.c,v $
- * Revision 1.24  2002-11-26 22:18:34  adam
+ * Revision 1.25  2003-03-05 16:41:10  adam
+ * Fix GCC warnings
+ *
+ * Revision 1.24  2002/11/26 22:18:34  adam
  * Remove // comments
  *
  * Revision 1.23  2002/08/02 19:26:56  adam
diff --git a/isamc/merge-d.c b/isamc/merge-d.c
index e72d334..2912ecf 100644
--- a/isamc/merge-d.c
+++ b/isamc/merge-d.c
@@ -1,4 +1,4 @@
-/* $Id: merge-d.c,v 1.29 2002-11-26 22:18:34 adam Exp $
+/* $Id: merge-d.c,v 1.30 2003-03-05 16:41:10 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -156,16 +156,19 @@ static int filter_isempty(FILTER F)
   return ( (0 == F->r1) && (0 == F->r2)) ;
 }
 
+#if 0
 static int filter_only_one(FILTER F)
 {
   return ( (0 != F->r1) && (0 == F->r2));
 }
+#endif
 
 /* We may need backfilling, if we read a lonely key to make */
 /* a singleton, but its bitw will not fit in. Then we need to */
 /* process it normally, which means reading it again. So we  */
 /* need to unread it first. Luckily the filter is empty at that */
 /* point */
+#if 0
 static void filter_backfill(FILTER F, struct it_key *k, int mode)
 {
   assert(F->r1 == FILTER_NOTYET ); /* not overwriting data! */
@@ -173,7 +176,7 @@ static void filter_backfill(FILTER F, struct it_key *k, int mode)
   F->m1=mode;
   F->r1=1; /* ok read */
 }
-
+#endif
 
 /***************************************************************
  * Singleton encoding
@@ -1097,7 +1100,10 @@ int isamd_append (ISAMD is, char *dictentry, int dictlen, ISAMD_I data)
 
 /*
  * $Log: merge-d.c,v $
- * Revision 1.29  2002-11-26 22:18:34  adam
+ * Revision 1.30  2003-03-05 16:41:10  adam
+ * Fix GCC warnings
+ *
+ * Revision 1.29  2002/11/26 22:18:34  adam
  * Remove // comments
  *
  * Revision 1.28  2002/08/02 19:26:56  adam
diff --git a/isamc/merge.c b/isamc/merge.c
index 0900684..15fa89a 100644
--- a/isamc/merge.c
+++ b/isamc/merge.c
@@ -1,4 +1,4 @@
-/* $Id: merge.c,v 1.21 2002-08-02 19:26:56 adam Exp $
+/* $Id: merge.c,v 1.22 2003-03-05 16:41:10 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -35,6 +35,7 @@ struct isc_merge_block {
     int dirty;        /* block is different from that on file */
 };
 
+#if 0
 static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
 			int last)
 {
@@ -62,6 +63,7 @@ static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
     if (!last)
 	mb[i].dirty = 1;
 }
+#endif
 
 static void flush_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
                           char *r_buf, int *firstpos, int cat, int last,
@@ -480,7 +482,10 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data)
 
 /*
  * $Log: merge.c,v $
- * Revision 1.21  2002-08-02 19:26:56  adam
+ * Revision 1.22  2003-03-05 16:41:10  adam
+ * Fix GCC warnings
+ *
+ * Revision 1.21  2002/08/02 19:26:56  adam
  * Towards GPL
  *
  * Revision 1.20  1999/11/30 13:48:04  adam