null+****@clear*****
null+****@clear*****
2010年 7月 28日 (水) 13:01:41 JST
Daijiro MORI 2010-07-28 04:01:41 +0000 (Wed, 28 Jul 2010)
New Revision: c950b2165553a94dadd859cb8dc1a2d5611fd52c
Log:
Cut off bitcmp2().
Modified files:
lib/pat.c
Modified: lib/pat.c (+1 -14)
===================================================================
--- lib/pat.c 2010-07-28 00:37:02 +0000 (c9e1d0d)
+++ lib/pat.c 2010-07-28 04:01:41 +0000 (1324bd9)
@@ -1675,19 +1675,6 @@ bitcmp(const void *s1, const void *s2, int offset, int length)
return (*a & mask) - (*b & mask);
}
-static int
-bitcmp2(const char *a, const char *b, uint32_t key_size)
-{
- uint32_t o = key_size >> 3;
- uint32_t m = key_size & 7;
- int r = o ? memcmp(a, b, o) : 0;
- if (!r && m) {
- uint8_t mask = 0xff << (8 - m);
- r = (a[o] & mask) - (b[o] & mask);
- }
- return r;
-}
-
inline static grn_rc
set_cursor_prefix(grn_ctx *ctx, grn_pat *pat, grn_pat_cursor *c,
const void *key, uint32_t key_size, int flags)
@@ -1724,7 +1711,7 @@ set_cursor_prefix(grn_ctx *ctx, grn_pat *pat, grn_pat_cursor *c,
if (!(k = pat_node_get_key(ctx, pat, node))) { break; }
if (PAT_LEN(node) < byte_len) { break; }
if ((flags & GRN_CURSOR_SIZE_BY_BIT)
- ? !bitcmp2(k, key, key_size)
+ ? !bitcmp(k, key, 0, key_size)
: !memcmp(k, key, key_size)) {
if (flags & GRN_CURSOR_DESCENDING) {
if ((ch > len - 1) || !(flags & GRN_CURSOR_GT)) {