From 4761773f2ff08474c71cc3f44cae1642b45834c1 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 2 Jun 2004 12:29:03 +0000 Subject: [PATCH] Make codec routines static --- index/kcompare.c | 10 +++++----- index/zrpn.c | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/index/kcompare.c b/index/kcompare.c index 82e9491..08a895b 100644 --- a/index/kcompare.c +++ b/index/kcompare.c @@ -1,4 +1,4 @@ -/* $Id: kcompare.c,v 1.44 2004-06-01 12:56:38 adam Exp $ +/* $Id: kcompare.c,v 1.45 2004-06-02 12:29:03 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -136,7 +136,7 @@ static void iscz1_code_stop (int mode, void *p) } #if INT_CODEC_NEW -CODEC_INLINE void iscz1_encode_int (unsigned d, char **dst) +static CODEC_INLINE void iscz1_encode_int (unsigned d, char **dst) { unsigned char *bp = (unsigned char*) *dst; @@ -149,7 +149,7 @@ CODEC_INLINE void iscz1_encode_int (unsigned d, char **dst) *dst = (char *) bp; } -CODEC_INLINE int iscz1_decode_int (unsigned char **src) +static CODEC_INLINE int iscz1_decode_int (unsigned char **src) { unsigned d = 0; unsigned char c; @@ -166,7 +166,7 @@ CODEC_INLINE int iscz1_decode_int (unsigned char **src) #else /* ! INT_CODEC_NEW */ -CODEC_INLINE void iscz1_encode_int (unsigned d, char **dst) +static CODEC_INLINE void iscz1_encode_int (unsigned d, char **dst) { unsigned char *bp = (unsigned char*) *dst; @@ -193,7 +193,7 @@ CODEC_INLINE void iscz1_encode_int (unsigned d, char **dst) *dst = (char *) bp; } -CODEC_INLINE int iscz1_decode_int (unsigned char **src) +static CODEC_INLINE int iscz1_decode_int (unsigned char **src) { unsigned c = *(*src)++; switch (c & 192) diff --git a/index/zrpn.c b/index/zrpn.c index 9e23c2f..2a4b593 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,4 +1,4 @@ -/* $Id: zrpn.c,v 1.138 2004-05-26 13:52:26 adam Exp $ +/* $Id: zrpn.c,v 1.139 2004-06-02 12:29:03 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -1686,6 +1686,7 @@ static RSET rpn_search_APT_or_list (ZebraHandle zh, bool_parms.rset_r = rset[i]; bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare_it; + bool_parms.log_item = key_logdump_txt; result = rset_create (rset_kind_or, &bool_parms); } return result; @@ -1743,6 +1744,7 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, bool_parms.rset_r = rset[i]; bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare_it; + bool_parms.log_item = key_logdump_txt; result = rset_create (rset_kind_and, &bool_parms); } return result; @@ -1987,6 +1989,7 @@ static RSET rpn_search_APT_numeric (ZebraHandle zh, bool_parms.rset_r = rset[i]; bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare_it; + bool_parms.log_item = key_logdump_txt; result = rset_create (rset_kind_and, &bool_parms); } return result; @@ -2457,6 +2460,7 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, } bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare_it; + bool_parms.log_item = key_logdump_txt; switch (zop->which) { @@ -2905,7 +2909,8 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare_it; - bool_parms.rset_l = rset; + bool_parms.log_item = key_logdump_txt; + bool_parms.rset_l = rset; bool_parms.rset_r = rset2; rset = rset_create (rset_kind_or, &bool_parms); @@ -2919,7 +2924,8 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare_it; - bool_parms.rset_l = rset; + bool_parms.log_item = key_logdump_txt; + bool_parms.rset_l = rset; bool_parms.rset_r = rset_dup(limit_set); rset = rset_create (rset_kind_and, &bool_parms); @@ -2984,7 +2990,8 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare_it; - bool_parms.rset_l = rset; + bool_parms.log_item = key_logdump_txt; + bool_parms.rset_l = rset; bool_parms.rset_r = rset2; rset = rset_create (rset_kind_or, &bool_parms); @@ -2998,6 +3005,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare_it; + bool_parms.log_item = key_logdump_txt; bool_parms.rset_l = rset; bool_parms.rset_r = rset_dup(limit_set); -- 1.7.10.4