X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fkcompare.c;h=3081bb1369297e883df7768fba0970f32ea9765a;hb=a11e628cb73fff31137b4faa3e653390ff66650f;hp=9bce34baa291a153fd866b8bffa2d16dcec947d1;hpb=7b30a2f79cd07ac02714bee483fff14ca9afaa24;p=idzebra-moved-to-github.git diff --git a/index/kcompare.c b/index/kcompare.c index 9bce34b..3081bb1 100644 --- a/index/kcompare.c +++ b/index/kcompare.c @@ -1,4 +1,4 @@ -/* $Id: kcompare.c,v 1.48 2004-08-04 09:00:00 adam Exp $ +/* $Id: kcompare.c,v 1.51 2004-09-01 15:01:32 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -33,7 +33,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define INT_CODEC_NEW 0 #endif +#ifdef __GNUC__ #define CODEC_INLINE inline +#else +#define CODEC_INLINE +#endif + void key_logdump_txt (int logmask, const void *p, const char *txt) { struct it_key key; @@ -157,7 +162,7 @@ int key_compare (const void *p1, const void *p2) return 0; } -int key_get_seq(const void *p) +zint key_get_seq(const void *p) { struct it_key k; memcpy (&k, p, sizeof(k)); @@ -232,10 +237,10 @@ static CODEC_INLINE void iscz1_encode_int (zint d, char **dst) while (d > 127) { - *bp++ = 128 | (d & 127); + *bp++ = (unsigned) (128 | (d & 127)); d = d >> 7; } - *bp++ = d; + *bp++ = (unsigned) d; *dst = (char *) bp; } @@ -389,7 +394,7 @@ void iscz1_decode (void *vp, char **dst, const char **src) #endif #if IT_KEY_NEW - int leader = iscz1_decode_int ((unsigned char **) src); + int leader = (int) iscz1_decode_int ((unsigned char **) src); i = leader & 7; if (leader & 64) p->key.mem[i] += iscz1_decode_int ((unsigned char **) src);