X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkinput.c;h=de1d56390b2f9191d68e40083cac1c2e86ae3d94;hb=95f8991b4c687a0d99a1e8751ef5aeeb7f6831bc;hp=8cd897fb9780e251cb0f1533105ef45bf93abc67;hpb=2861525dc044c1816b2e6f471927c62cacd5fc61;p=idzebra-moved-to-github.git diff --git a/index/kinput.c b/index/kinput.c index 8cd897f..de1d563 100644 --- a/index/kinput.c +++ b/index/kinput.c @@ -1,8 +1,5 @@ -/* $Id: kinput.c,v 1.88 2008-01-09 14:57:07 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-2009 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 @@ -36,8 +33,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define KEY_SIZE (1+sizeof(struct it_key)) #define INP_NAME_MAX 768 -#define INP_BUF_START 60000 -#define INP_BUF_ADD 400000 struct key_file { int no; /* file no */ @@ -190,7 +185,7 @@ int key_file_read(struct key_file *f, char *key) key[i++] = c; while ((c = key_file_getc(f))) { - if (i < IT_MAX_WORD) + if (i < INP_NAME_MAX-2) key[i++] = c; } key[i++] = '\0'; @@ -365,7 +360,7 @@ static int heap_read_one(struct heap_info *hi, char *name, char *key) /* for debugging only */ void zebra_log_dict_entry(ZebraHandle zh, const char *s) { - char dst[IT_MAX_WORD+1]; + char dst[INP_NAME_MAX+1]; int ord; int len = key_SU_decode(&ord, (const unsigned char *) s); const char *index_type; @@ -801,6 +796,7 @@ void zebra_index_merge(ZebraHandle zh) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab