X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamb%2Fisamb.c;h=bb5139300cd1de37743d70eb00ed90d55d6f821e;hb=b0e96fd39e829ed6efb70a27999986fab11301f6;hp=9f8fb848ee946ad87f2521f9dcf6c51f87e868ac;hpb=dffefbf2faee02ce58bc8d3659a4b250d46c838b;p=idzebra-moved-to-github.git

diff --git a/isamb/isamb.c b/isamb/isamb.c
index 9f8fb84..bb51393 100644
--- a/isamb/isamb.c
+++ b/isamb/isamb.c
@@ -1,5 +1,5 @@
-/* $Id: isamb.c,v 1.80 2005-06-29 12:31:46 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: isamb.c,v 1.83 2006-08-14 10:40:17 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <stdlib.h>
@@ -299,7 +299,7 @@ static void flush_blocks (ISAMB b, int cat)
     }
 }
 
-static int cache_block (ISAMB b, ISAM_P pos, char *userbuf, int wr)
+static int cache_block (ISAMB b, ISAM_P pos, unsigned char *userbuf, int wr)
 {
     int cat = (int) (pos&CAT_MASK);
     int off = (int) (((pos/CAT_MAX) & 
@@ -456,7 +456,7 @@ static struct ISAMB_block *open_block(ISAMB b, ISAM_P pos)
             abort();
         }
     }
-    p->bytes = p->buf + offset;
+    p->bytes = (char *)p->buf + offset;
     p->leaf = p->buf[0];
     p->size = (p->buf[1] + 256 * p->buf[2]) - offset;
     if (p->size < 0)
@@ -465,7 +465,7 @@ static struct ISAMB_block *open_block(ISAMB b, ISAM_P pos)
 		 p->size, pos);
     }
     assert (p->size >= 0);
-    src = p->buf + 3;
+    src = (char*) p->buf + 3;
     decode_ptr(&src, &p->no_items);
 
     p->offset = 0;
@@ -509,7 +509,7 @@ struct ISAMB_block *new_block (ISAMB b, int leaf, int cat)
     p->cat = cat;
     b->file[cat].head_dirty = 1;
     memset (p->buf, 0, b->file[cat].head.block_size);
-    p->bytes = p->buf + b->file[cat].head.block_offset;
+    p->bytes = (char*)p->buf + b->file[cat].head.block_offset;
     p->leaf = leaf;
     p->size = 0;
     p->dirty = 1;
@@ -592,7 +592,7 @@ void close_block(ISAMB b, struct ISAMB_block *p)
     {
 	int offset = b->file[p->cat].head.block_offset;
         int size = p->size + offset;
-	char *dst =  p->buf + 3;
+	char *dst =  (char*)p->buf + 3;
         assert (p->size >= 0);
 	
 	/* memset becuase encode_ptr usually does not write all bytes */
@@ -1947,3 +1947,11 @@ again:
     }
     return 1;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+