Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add_command has an unused argument

This commit is contained in:
Enno Rehling 2016-09-07 15:36:48 +02:00
parent d962dd110a
commit eed6e1d88d
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/kernel/command.c
View File

@ -30,7 +30,6 @@
typedef struct command { typedef struct command {
parser fun; parser fun;
struct tnode *nodes;
} command; } command;
void *stree_find(const syntaxtree * stree, const struct locale *lang) void *stree_find(const syntaxtree * stree, const struct locale *lang)
@ -76,7 +75,6 @@ const char *str, parser fun)
assert(str); assert(str);
cmd->fun = fun; cmd->fun = fun;
cmd->nodes = tnext;
var.v = cmd; var.v = cmd;
addtoken(keys, str, var); addtoken(keys, str, var);
} }
@ -90,12 +88,8 @@ static int do_command_i(const struct tnode *keys, struct unit *u, struct order *
c = gettoken(token, sizeof(token)); c = gettoken(token, sizeof(token));
if (findtoken(keys, c, &var) == E_TOK_SUCCESS) { if (findtoken(keys, c, &var) == E_TOK_SUCCESS) {
command *cmd = (command *)var.v; command *cmd = (command *)var.v;
if (cmd->nodes && *c) { if (cmd->fun) {
assert(!cmd->fun); cmd->fun(0, u, ord);
return do_command_i(cmd->nodes, u, ord);
}
else if (cmd->fun) {
cmd->fun(cmd->nodes, u, ord);
return E_TOK_SUCCESS; return E_TOK_SUCCESS;
} }
} }