From 68d94f14f5dc211c46689f33a9f61ad4682b8d0e Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 18 Nov 1997 10:04:03 +0000 Subject: [PATCH] Function res_trav returns number of 'hits'. --- include/res.h | 9 ++++++--- util/res.c | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/include/res.h b/include/res.h index 1903cf6..8908222 100644 --- a/include/res.h +++ b/include/res.h @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: res.h,v $ - * Revision 1.8 1997-09-17 12:19:10 adam + * Revision 1.9 1997-11-18 10:04:03 adam + * Function res_trav returns number of 'hits'. + * + * 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. * @@ -54,8 +57,8 @@ 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 diff --git a/util/res.c b/util/res.c index 4e25261..c1f3d3c 100644 --- a/util/res.c +++ b/util/res.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: res.c,v $ - * Revision 1.20 1997-10-31 12:39:15 adam + * Revision 1.21 1997-11-18 10:04:03 adam + * Function res_trav returns number of 'hits'. + * + * Revision 1.20 1997/10/31 12:39:15 adam * Resouce name can be terminated with either white-space or colon. * * Revision 1.19 1997/10/27 14:27:59 adam @@ -293,12 +296,13 @@ void res_put (Res r, const char *name, const char *value) re->value = xstrdup (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)) { struct res_entry *re; int l = 0; - + int no = 0; + assert (r); if (prefix) l = strlen(prefix); @@ -307,7 +311,11 @@ void res_trav (Res r, const char *prefix, void *p, for (re = r->first; re; re=re->next) if (re->value) if (l==0 || !memcmp (re->name, prefix, l)) + { (*f)(p, re->name, re->value); + no++; + } + return no; } -- 1.7.10.4