X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fkcontrol.c;h=0317d0377bdacaee7c3cd6c9c6a4022cf52f4b8a;hp=e5122a7676add16e2b54ac93478c1abe4551b1dd;hb=354f1142c4cc8c59b6f1170b95caec40bfe4d8c0;hpb=deb0cef3d4d19dc6508b2fed71711b3fb1be26a2 diff --git a/index/kcontrol.c b/index/kcontrol.c index e5122a7..0317d03 100644 --- a/index/kcontrol.c +++ b/index/kcontrol.c @@ -1,8 +1,5 @@ -/* $Id: kcontrol.c,v 1.5 2006-08-16 13:16:36 adam Exp $ - Copyright (C) 1995-2006 - 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 "index.h" @@ -56,13 +56,12 @@ static void my_dec(struct rset_key_control *kc) struct rset_key_control *zebra_key_control_create(ZebraHandle zh) { - const char *res_val; struct rset_key_control *kc = xmalloc(sizeof(*kc)); struct context_control *cp = xmalloc(sizeof(*cp)); kc->context = cp; kc->key_size = sizeof(struct it_key); - kc->cmp = key_compare_it; + kc->cmp = key_compare; kc->key_logdump_txt = key_logdump_txt; kc->getseq = key_get_seq; @@ -77,7 +76,7 @@ struct rset_key_control *zebra_key_control_create(ZebraHandle zh) kc->get_segment = 0; } - zebra_limit_for_rset(zh->m_limit, + zebra_limit_for_rset(zh->m_limit, &kc->filter_func, &cp->filter_destroy, &kc->filter_data); @@ -90,6 +89,7 @@ struct rset_key_control *zebra_key_control_create(ZebraHandle zh) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab