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
New result set model and modular ranking system. Moved towards
[idzebra-moved-to-github.git]
/
util
/
res.c
diff --git
a/util/res.c
b/util/res.c
index
4e25261
..
5710648
100644
(file)
--- a/
util/res.c
+++ b/
util/res.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: res.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: res.c,v $
- * Revision 1.20 1997-10-31 12:39:15 adam
+ * Revision 1.22 1998-01-12 15:04:32 adam
+ * Removed exit - call.
+ *
+ * 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
* Resouce name can be terminated with either white-space or colon.
*
* Revision 1.19 1997/10/27 14:27:59 adam
@@
-112,8
+118,8
@@
static void reread (Res r)
fr = fopen (r->name, "r");
if (!fr)
{
fr = fopen (r->name, "r");
if (!fr)
{
- logf (LOG_FATAL|LOG_ERRNO, "Cannot open %s", r->name);
- exit (1);
+ logf (LOG_WARN|LOG_ERRNO, "Cannot open %s", r->name);
+ return ;
}
while (1)
{
}
while (1)
{
@@
-211,7
+217,10
@@
Res res_open (const char *name)
#else
if (access (name, R_OK))
#endif
#else
if (access (name, R_OK))
#endif
- logf (LOG_LOG|LOG_ERRNO, "Cannot access `%s'", name);
+ {
+ logf (LOG_LOG|LOG_ERRNO, "Cannot access resource file `%s'", name);
+ return NULL;
+ }
r = xmalloc (sizeof(*r));
r->init = 0;
r->first = r->last = NULL;
r = xmalloc (sizeof(*r));
r->init = 0;
r->first = r->last = NULL;
@@
-293,12
+302,13
@@
void res_put (Res r, const char *name, const char *value)
re->value = xstrdup (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;
{
struct res_entry *re;
int l = 0;
-
+ int no = 0;
+
assert (r);
if (prefix)
l = strlen(prefix);
assert (r);
if (prefix)
l = strlen(prefix);
@@
-307,7
+317,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))
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);
(*f)(p, re->name, re->value);
+ no++;
+ }
+ return no;
}
}