projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Read-only sets uses common no write handler
[idzebra-moved-to-github.git]
/
index
/
kcontrol.c
diff --git
a/index/kcontrol.c
b/index/kcontrol.c
index
e5122a7
..
5283899
100644
(file)
--- 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) 2004-2013 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
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 <config.h>
+#endif
#include <assert.h>
#include "index.h"
#include <assert.h>
#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)
{
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);
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;
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;
}
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);
&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
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab