chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Python IP addresses: Remove sys.path hacking from test script
[secnet.git]
/
conffile.c
diff --git
a/conffile.c
b/conffile.c
index 565e37ff9b8ed608ea867106aaebc17156d3b8f9..24d7e25b154e1ec30eaf8b48ce14b9179007b713 100644
(file)
--- a/
conffile.c
+++ b/
conffile.c
@@
-35,7
+35,7
@@
struct dict {
struct dict *parent;
struct searchlist *search;
struct entry *entries;
struct dict *parent;
struct searchlist *search;
struct entry *entries;
-
u
int32_t size;
+ int32_t size;
};
static struct atomlist *atoms=NULL;
};
static struct atomlist *atoms=NULL;
@@
-154,7
+154,7
@@
static void ptree_mangle(struct p_node *t)
#ifdef DUMP_PARSE_TREE
/* Convert a node type to a string, for parse tree dump */
#ifdef DUMP_PARSE_TREE
/* Convert a node type to a string, for parse tree dump */
-static
string_t
ntype(uint32_t type)
+static
const char *
ntype(uint32_t type)
{
switch(type) {
case T_STRING: return "T_STRING";
{
switch(type) {
case T_STRING: return "T_STRING";
@@
-173,20
+173,20
@@
static string_t ntype(uint32_t type)
return "**unknown**";
}
return "**unknown**";
}
-static void ptree_indent(
uint32_
t amount)
+static void ptree_indent(
in
t amount)
{
{
-
uint32_
t i;
+
in
t i;
for (i=0; i<amount; i++) printf(" . ");
}
for (i=0; i<amount; i++) printf(" . ");
}
-static void ptree_dump(struct p_node *n,
uint32_
t d)
+static void ptree_dump(struct p_node *n,
in
t d)
{
if (!n) {
printf("NULL\n");
return;
}
{
if (!n) {
printf("NULL\n");
return;
}
- if (
n->type<10
) {
+ if (
T_IS_PRIMITIVE(n->type)
) {
switch(n->type) {
case T_STRING: printf("T_STRING: \"%s\" (%s line %d)\n",
n->data.string,n->loc.file,n->loc.line); break;
switch(n->type) {
case T_STRING: printf("T_STRING: \"%s\" (%s line %d)\n",
n->data.string,n->loc.file,n->loc.line); break;
@@
-197,7
+197,7
@@
static void ptree_dump(struct p_node *n, uint32_t d)
default: printf("**unknown primitive type**\n"); break;
}
} else {
default: printf("**unknown primitive type**\n"); break;
}
} else {
- assert(d<
INT_MAX
);
+ assert(d<
10000
);
printf("%s: (%s line %d)\n",ntype(n->type),n->loc.file,n->loc.line);
ptree_indent(d);
printf(" |-"); ptree_dump(n->l, d+1);
printf("%s: (%s line %d)\n",ntype(n->type),n->loc.file,n->loc.line);
ptree_indent(d);
printf(" |-"); ptree_dump(n->l, d+1);
@@
-561,10
+561,10
@@
list_t *list_new(void)
return NULL;
}
return NULL;
}
-
uint32_t list_length(
list_t *a)
+
int32_t list_length(const
list_t *a)
{
{
-
u
int32_t l=0;
- list_t *i;
+ int32_t l=0;
+
const
list_t *i;
for (i=a; i; i=i->next) { assert(l < INT_MAX); l++; }
return l;
}
for (i=a; i; i=i->next) { assert(l < INT_MAX); l++; }
return l;
}
@@
-608,7
+608,7
@@
list_t *list_append(list_t *list, item_t *item)
return list_append_list(list,l);
}
return list_append_list(list,l);
}
-item_t *list_elem(list_t *l,
u
int32_t index)
+item_t *list_elem(list_t *l, int32_t index)
{
if (!l) return NULL;
if (index==0) return l->item;
{
if (!l) return NULL;
if (index==0) return l->item;
@@
-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;
}