X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fserver%2Fhttpd.c;h=af8c3c8bb5f7097b403b498591f485c26599b78f;hb=051e2c99ab8111f6bffdb412b40ceef333530ae6;hp=b346ca2ee68663eb6fc0a5310fcbce3517d31125;hpb=7b2906de246bc37af99d432b3edf12e9f5f63521;p=openocd.git

diff --git a/src/server/httpd.c b/src/server/httpd.c
index b346ca2ee6..af8c3c8bb5 100644
--- a/src/server/httpd.c
+++ b/src/server/httpd.c
@@ -26,7 +26,7 @@
 #endif
 
 #include "telnet_server.h"
-#include "target.h"
+#include <target/target.h>
 
 #include <microhttpd.h>
 #include <pthread.h>
@@ -118,11 +118,11 @@ static int httpd_Jim_Command_writeform(Jim_Interp *interp, int argc,
 	// Find length
 	const char *data;
 	int actual;
-
 	int retcode;
-
-	const char *script = alloc_printf("set dummy_val $httppostdata(%s); set dummy_val",
+	const char *script = alloc_printf(
+			"set dummy_val $httppostdata(%s); set dummy_val",
 			name);
+
 	retcode = Jim_Eval_Named(interp, script, __FILE__, __LINE__);
 	free((void *) script);
 	if (retcode != JIM_OK)
@@ -154,27 +154,25 @@ httpd_Jim_Command_formfetch(Jim_Interp *interp,
                                    int argc,
                                    Jim_Obj *const *argv)
 {
-    if (argc != 2)
-    {
-        Jim_WrongNumArgs(interp, 1, argv, "method ?CMD_ARGV ...?");
-        return JIM_ERR;
-    }
-    char *name = (char*)Jim_GetString(argv[1], NULL);
-
-
-    const char *script = alloc_printf("set dummy_val $httppostdata(%s); set dummy_val",
-    			name);
-    	int retcode = Jim_Eval_Named(interp, script, __FILE__, __LINE__);
-    	free((void *) script);
-    	if (retcode != JIM_OK)
-    	{
-    	    Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
-    	} else
-    	{
-    	    Jim_SetResult(interp, Jim_GetResult(interp));
-    	}
-
-    return JIM_OK;
+	if (argc != 2)
+	{
+		Jim_WrongNumArgs(interp, 1, argv, "method ?CMD_ARGV ...?");
+		return JIM_ERR;
+	}
+
+	char *name = (char*)Jim_GetString(argv[1], NULL);
+	const char *script = alloc_printf(
+		"set dummy_val $httppostdata(%s); set dummy_val",
+		name);
+	int retcode = Jim_Eval_Named(interp, script, __FILE__, __LINE__);
+
+	free((void *) script);
+	if (retcode != JIM_OK)
+		Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
+	else
+		Jim_SetResult(interp, Jim_GetResult(interp));
+
+	return JIM_OK;
 }
 
 struct httpd_request
@@ -467,16 +465,16 @@ static struct MHD_Daemon * d;
 static const struct command_registration httpd_command_handlers[] = {
 	{
 		.name = "formfetch",
-		.jim_handler = &httpd_Jim_Command_formfetch,
+		.jim_handler = httpd_Jim_Command_formfetch,
 		.mode = COMMAND_EXEC,
-		.usage = "<parameter_name>",
+		.usage = "parameter_name",
 		.help = "Reads a posted form value.",
 	},
 	{
 		.name = "writeform",
-		.jim_handler = &httpd_Jim_Command_writeform,
+		.jim_handler = httpd_Jim_Command_writeform,
 		.mode = COMMAND_EXEC,
-		.usage = "<parameter_name> <file>",
+		.usage = "parameter_name filename",
 		.help = "Writes a form value to a file.",
 	},
 	COMMAND_REGISTRATION_DONE