Removed some header files, they all contained one function prototype,

and a lot of overhead. Moved said prototypes into rset.h

diff --git a/include/rsbetween.h b/include/rsbetween.h
deleted file mode 100644 (file)
index 94fec58..0000000
--- a/include/rsbetween.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $Id: rsbetween.h,v 1.7 2004-09-01 15:01:32 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
-
-This file is part of the Zebra server.
-
-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
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-*/
-
-
-
-#ifndef RSET_BETWEEN_H
-#define RSET_BETWEEN_H
-
-#include <rset.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#error "do not use rsbetween.h, it all is in rset.h"
-RSET rsbetween_create( NMEM nmem, int key_size, 
-            int (*cmp)(const void *p1, const void *p2),
-            RSET rset_l, RSET rset_m, RSET rset_r, RSET rset_attr,
-            char *(*printer)(const void *p1, char *buf) );
-
-extern const struct rset_control *rset_kind_between;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

diff --git a/include/rsbool.h b/include/rsbool.h
deleted file mode 100644 (file)
index f2bf339..0000000
--- a/include/rsbool.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $Id: rsbool.h,v 1.11 2004-09-01 15:01:32 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
-
-This file is part of the Zebra server.
-
-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
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-*/
-
-#ifndef RSET_BOOL_H
-#define RSET_BOOL_H
-
-#include <rset.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#error "rsbool.h no longer needed, use rset.h insted"
-
-RSET rsbool_create_and( NMEM nmem, int key_size, 
-            int (*cmp)(const void *p1, const void *p2),
-            RSET rset_l, RSET rset_r, 
-            void (*log_item)(int logmask, const void *p, const char *txt) );
-
-RSET rsbool_create_or( NMEM nmem, int key_size, 
-            int (*cmp)(const void *p1, const void *p2),
-            RSET rset_l, RSET rset_r, 
-            void (*log_item)(int logmask, const void *p, const char *txt) );
-
-RSET rsbool_create_not( NMEM nmem, int key_size, 
-            int (*cmp)(const void *p1, const void *p2),
-            RSET rset_l, RSET rset_r, 
-            void (*log_item)(int logmask, const void *p, const char *txt) );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

diff --git a/include/rsisamb.h b/include/rsisamb.h
deleted file mode 100644 (file)
index 8cd45bc..0000000
--- a/include/rsisamb.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $Id: rsisamb.h,v 1.5 2004-09-01 15:01:32 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
-
-This file is part of the Zebra server.
-
-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
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-*/
-
-
-
-#ifndef RSET_ISAMB_H
-#define RSET_ISAMB_H
-
-#include <rset.h>
-#include <isamb.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#error "Never mind rsisamb.h, it is all in rset.h "
-/* extern const struct rset_control *rset_kind_isamb; */
-
-RSET rsisamb_create( NMEM nmem, int key_size, 
-            int (*cmp)(const void *p1, const void *p2),
-            ISAMB is, ISAMB_P pos);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

diff --git a/include/rsisamc.h b/include/rsisamc.h
deleted file mode 100644 (file)
index 67b34ec..0000000
--- a/include/rsisamc.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $Id: rsisamc.h,v 1.10 2004-09-01 15:01:32 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
-
-This file is part of the Zebra server.
-
-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
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-*/
-
-
-
-#ifndef RSET_ISAMC_H
-#define RSET_ISAMC_H
-
-#include <rset.h>
-#include <isamc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#error "do not use rsisamc.h any more, rset.h covers it all "
-extern const struct rset_control *rset_kind_isamc;
-
-RSET rsisamc_create( NMEM nmem, int key_size, 
-            int (*cmp)(const void *p1, const void *p2),
-            ISAMC is, ISAMC_P pos);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

diff --git a/include/rsisams.h b/include/rsisams.h
deleted file mode 100644 (file)
index 4fabf75..0000000
--- a/include/rsisams.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $Id: rsisams.h,v 1.5 2004-09-01 15:01:32 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
-
-This file is part of the Zebra server.
-
-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
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-*/
-
-
-
-#ifndef RSET_ISAMS_H
-#define RSET_ISAMS_H
-
-#include <rset.h>
-#include <isams.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#error "do not use rsisams.h, it is all in rset.h"
-extern const struct rset_control *rset_kind_isams;
-
-RSET rsisams_create( NMEM nmem, int key_size, 
-            int (*cmp)(const void *p1, const void *p2),
-            ISAMS is, ISAMS_P pos);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

diff --git a/include/rsmultior.h b/include/rsmultior.h
deleted file mode 100644 (file)
index 3903cf2..0000000
--- a/include/rsmultior.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $Id: rsmultior.h,v 1.5 2004-09-01 15:01:32 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
-
-This file is part of the Zebra server.
-
-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
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-*/
-
-
-
-#ifndef RSET_MULTIOR_H
-#define RSET_MULTIOR_H
-
-#include <rset.h>
-
-#error "do not use rsmultior.h any more, it is all in rset.h"
-YAZ_BEGIN_CDECL
-
-RSET rsmultior_create( NMEM nmem, int key_size, 
-            int (*cmp)(const void *p1, const void *p2),
-            int no_rsets, RSET* rsets);
-
-YAZ_END_CDECL
-
-#endif

diff --git a/include/rsnull.h b/include/rsnull.h
deleted file mode 100644 (file)
index 0c0f84c..0000000
--- a/include/rsnull.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $Id: rsnull.h,v 1.8 2004-09-01 15:01:32 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
-
-This file is part of the Zebra server.
-
-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
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-*/
-
-
-
-#ifndef RSET_NULL_H
-#define RSET_NULL_H
-
-#include <rset.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#error "rsnull.h not used any more, use rset.h instead"
-RSET rsnull_create(NMEM nmem);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

diff --git a/include/rstemp.h b/include/rstemp.h
deleted file mode 100644 (file)
index 016a1c6..0000000
--- a/include/rstemp.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $Id: rstemp.h,v 1.12 2004-09-01 15:01:32 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
-
-This file is part of the Zebra server.
-
-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
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-*/
-
-
-
-#ifndef RSET_TEMP_H
-#define RSET_TEMP_H
-
-#include <rset.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#error "rstemp.h should no longer be used, its stuff is in rset.h"
-/* moved into rset.h, this is too simple to keep in a file of its own */
-/*
-RSET rstemp_create( NMEM nmem, const struct key_control *kcontrol,
-                    const char *temp_path);
-*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif