X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fres.h;h=9eb90dead0a3920371f9aca838c2b673d28b9403;hb=79176bd8a477e1c64ac3ec03b50405ed5ed85a3f;hp=1903cf6d8eef8e64994f371541b8f0d4b1dccba9;hpb=b9093505b17a074e79137ed64595c8269f77d330;p=idzebra-moved-to-github.git

diff --git a/include/res.h b/include/res.h
index 1903cf6..9eb90de 100644
--- a/include/res.h
+++ b/include/res.h
@@ -1,33 +1,26 @@
-/*
- * Copyright (C) 1994-1997, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: res.h,v $
- * Revision 1.8  1997-09-17 12:19:10  adam
- * Zebra version corresponds to YAZ version 1.4.
- * Changed Zebra server so that it doesn't depend on global common_resource.
- *
- * Revision 1.7  1997/09/05 15:30:02  adam
- * Changed prototype for chr_map_input - added const.
- * Added support for C++, headers uses extern "C" for public definitions.
- *
- * Revision 1.6  1996/10/29 13:44:12  adam
- * Added res_get_match.
- *
- * Revision 1.5  1994/09/16 14:37:46  quinn
- * added res_get_def
- *
- * Revision 1.4  1994/09/06  13:02:29  quinn
- * Removed const from res_get
- *
- * Revision 1.3  1994/08/18  09:43:04  adam
- * Added res_trav. Major changes of prototypes.
- *
- * Revision 1.2  1994/08/18  08:22:26  adam
- * Res.h modified. xmalloc now declares xstrdup.
- *
- */
+/* $Id: res.h,v 1.12 2002-08-02 19:26:55 adam 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 RES_H
 #define RES_H
@@ -36,26 +29,16 @@
 extern "C" {
 #endif
 
-struct res_entry {
-    char *name;
-    char *value;
-    struct res_entry *next;
-};
-
-typedef struct res_struct {
-    struct res_entry *first, *last;
-    char *name;
-    int  init;
-} *Res;
+typedef struct res_struct *Res;
 
-Res res_open (const char *name);
+Res res_open (const char *name, Res res_def);
 void res_close (Res r);
 char *res_get (Res r, const char *name);
 char *res_get_def (Res r, const char *name, char *def);
 int res_get_match (Res r, const char *name, const char *value, const char *s);
 void res_put (Res r, const char *name, const char *value);
-void res_trav (Res r, const char *prefix, void *p,
-               void (*f)(void *p, const char *name, const char *value));
+int res_trav (Res r, const char *prefix, void *p,
+	      void (*f)(void *p, const char *name, const char *value));
 int res_write (Res r);
 
 #ifdef __cplusplus