chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logging: Move "starting" message earlier
[secnet.git]
/
conffile.c
diff --git
a/conffile.c
b/conffile.c
index 7f0202ca7f9c034b64bc466eb58a024f01f902d1..e3a74aab90fd481b73b0b8455db5eb17603054be 100644
(file)
--- a/
conffile.c
+++ b/
conffile.c
@@
-5,7
+5,7
@@
*
* secnet is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
*
* secnet 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
d
of the License, or
+ * the Free Software Foundation; either version
3
of the License, or
* (at your option) any later version.
*
* secnet is distributed in the hope that it will be useful, but
* (at your option) any later version.
*
* secnet is distributed in the hope that it will be useful, but
@@
-655,19
+655,18
@@
void add_closure(dict_t *dict, cstring_t name, apply_fn apply)
}
void *find_cl_if(dict_t *dict, cstring_t name, uint32_t type,
}
void *find_cl_if(dict_t *dict, cstring_t name, uint32_t type,
- bool_t
fail_if_invali
d, cstring_t desc, struct cloc loc)
+ bool_t
require
d, cstring_t desc, struct cloc loc)
{
item_t *i;
closure_t *cl;
{
item_t *i;
closure_t *cl;
- i = dict_find_item(dict,name,fail_if_invalid,desc,loc);
+ i = dict_find_item(dict,name,required,desc,loc);
+ if (!i) return NULL;
if (i->type!=t_closure) {
if (i->type!=t_closure) {
- if (!fail_if_invalid) return NULL;
cfgfatal(loc,desc,"\"%s\" must be a closure\n",name);
}
cl=i->data.closure;
if (cl->type!=type) {
cfgfatal(loc,desc,"\"%s\" must be a closure\n",name);
}
cl=i->data.closure;
if (cl->type!=type) {
- if (!fail_if_invalid) return NULL;
cfgfatal(loc,desc,"\"%s\" is the wrong type of closure\n",name);
}
return cl->interface;
cfgfatal(loc,desc,"\"%s\" is the wrong type of closure\n",name);
}
return cl->interface;