chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct a couple of errors in the README.
[secnet.git]
/
conffile.c
diff --git
a/conffile.c
b/conffile.c
index 5cce211415921556a5c384817d1278d9eb9dc158..53c334bd6b0279625574242437c3002cc66ac5de 100644
(file)
--- a/
conffile.c
+++ b/
conffile.c
@@
-639,16
+639,10
@@
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,
bool_t fail_if_invalid, cstring_t desc, struct cloc loc)
{
void *find_cl_if(dict_t *dict, cstring_t name, uint32_t type,
bool_t fail_if_invalid, cstring_t desc, struct cloc loc)
{
- list_t *l;
item_t *i;
closure_t *cl;
item_t *i;
closure_t *cl;
- l=dict_lookup(dict,name);
- if (!l) {
- if (!fail_if_invalid) return NULL;
- cfgfatal(loc,desc,"closure \"%s\" not found\n",name);
- }
- i=list_elem(l,0);
+ i = dict_find_item(dict,name,fail_if_invalid,desc,loc);
if (i->type!=t_closure) {
if (!fail_if_invalid) return NULL;
cfgfatal(loc,desc,"\"%s\" must be a closure\n",name);
if (i->type!=t_closure) {
if (!fail_if_invalid) return NULL;
cfgfatal(loc,desc,"\"%s\" must be a closure\n",name);
@@
-673,6
+667,8
@@
item_t *dict_find_item(dict_t *dict, cstring_t key, bool_t required,
if (!required) return NULL;
cfgfatal(loc,desc,"required parameter \"%s\" not found\n",key);
}
if (!required) return NULL;
cfgfatal(loc,desc,"required parameter \"%s\" not found\n",key);
}
+ if(list_length(l) != 1)
+ cfgfatal(loc,desc,"parameter \"%s\" has wrong number of values",key);
i=list_elem(l,0);
return i;
}
i=list_elem(l,0);
return i;
}