httpd: use register_commands()

Updates httpd_start() to use register_commands() for 'readform' and
'writeform' commands.  Adds server/httpd.h to export the new signatures
for this function (and httpd_stop), which allows removing the obsoleted
declarations inside openocd.c.
This commit is contained in:
Zachary T Welch
2009-11-24 10:58:32 -08:00
parent 17a9dea53a
commit 8f5ff3ddcf
4 changed files with 51 additions and 20 deletions

View File

@@ -460,7 +460,25 @@ static int ahc_echo(void * cls, struct MHD_Connection * connection,
static struct MHD_Daemon * d;
int httpd_start(void)
static const struct command_registration httpd_command_handlers[] = {
{
.name = "formfetch",
.jim_handler = &httpd_Jim_Command_formfetch,
.mode = COMMAND_EXEC,
.usage = "<parameter_name>",
.help = "Reads a posted form value.",
},
{
.name = "writeform",
.jim_handler = &httpd_Jim_Command_writeform,
.mode = COMMAND_EXEC,
.usage = "<parameter_name> <file>",
.help = "Writes a form value to a file.",
},
COMMAND_REGISTRATION_DONE
};
int httpd_start(struct command_context *cmd_ctx)
{
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
@@ -475,20 +493,7 @@ int httpd_start(void)
if (d == NULL)
return ERROR_FAIL;
Jim_CreateCommand(interp,
"formfetch",
httpd_Jim_Command_formfetch,
NULL,
NULL);
Jim_CreateCommand(interp,
"writeform",
httpd_Jim_Command_writeform,
NULL,
NULL);
return ERROR_OK;
return register_commands(cmd_ctx, NULL, httpd_command_handlers);
}
void httpd_stop(void)