X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fkey_block.c;h=d127d556ee82c6b3c2de7c39df91ece09f1310b1;hp=19a3a1ad9f530d909407ee44ae2f82faee249c28;hb=a5c8c78e8671af863fc61b2ad8b24f92f827f7b2;hpb=27a6d4f7f7425896345ab5a2bfdf35a96c97416e diff --git a/index/key_block.c b/index/key_block.c index 19a3a1a..d127d55 100644 --- a/index/key_block.c +++ b/index/key_block.c @@ -1,8 +1,5 @@ -/* $Id: key_block.c,v 1.10 2007-04-07 22:24:12 adam Exp $ - Copyright (C) 1995-2007 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 1994-2011 Index Data Zebra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -20,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -99,15 +99,21 @@ static void encode_key_init(struct encode_info *i) i->decode_handle = iscz1_start(); } -static void encode_key_write (char *k, struct encode_info *i, FILE *outf) +static void encode_key_write(const char *k, struct encode_info *i, FILE *outf) { struct it_key key; char *bp = i->buf, *bp0; const char *src = (char *) &key; + size_t klen = strlen(k); + + if (fwrite (k, klen+1, 1, outf) != 1) + { + yaz_log (YLOG_FATAL|YLOG_ERRNO, "fwrite"); + zebra_exit("encode_key_write"); + } + + k = k + klen+1; - /* copy term to output buf */ - while ((*bp++ = *k++)) - ; /* and copy & align key so we can mangle */ memcpy (&key, k+1, sizeof(struct it_key)); /* *k is insert/delete */ @@ -410,6 +416,7 @@ int key_block_get_no_files(zebra_key_block_t p) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab