refactor command_new to use command_registration

Save stack space: use a struct.  Makes it easier to add new parameters.
__archive__
Zachary T Welch 2009-11-23 15:01:12 -08:00
parent f74e2e033a
commit cd7e76ebf0
1 changed files with 10 additions and 12 deletions

View File

@ -238,23 +238,21 @@ static struct command **command_list_for_parent(
} }
static struct command *command_new(struct command_context *cmd_ctx, static struct command *command_new(struct command_context *cmd_ctx,
struct command *parent, const char *name, struct command *parent, const struct command_registration *cr)
command_handler_t handler, enum command_mode mode,
const char *help, const char *usage)
{ {
assert(name); assert(cr->name);
struct command *c = malloc(sizeof(struct command)); struct command *c = malloc(sizeof(struct command));
memset(c, 0, sizeof(struct command)); memset(c, 0, sizeof(struct command));
c->name = strdup(name); c->name = strdup(cr->name);
if (help) if (cr->help)
c->help = strdup(help); c->help = strdup(cr->help);
if (usage) if (cr->usage)
c->usage = strdup(usage); c->usage = strdup(cr->usage);
c->parent = parent; c->parent = parent;
c->handler = handler; c->handler = cr->handler;
c->mode = mode; c->mode = cr->mode;
command_add_child(command_list_for_parent(cmd_ctx, parent), c); command_add_child(command_list_for_parent(cmd_ctx, parent), c);
@ -328,7 +326,7 @@ struct command* register_command(struct command_context *context,
return c; return c;
} }
c = command_new(context, parent, name, cr->handler, cr->mode, cr->help, cr->usage); c = command_new(context, parent, cr);
/* if allocation failed or it is a placeholder (no handler), we're done */ /* if allocation failed or it is a placeholder (no handler), we're done */
if (NULL == c || NULL == c->handler) if (NULL == c || NULL == c->handler)
return c; return c;