Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
typo in comment
[openocd.git] / src / server / httpd.c
diff --git a/src/server/httpd.c b/src/server/httpd.c
index 6d9851533d8af87ece3c307b3133e810f6a175da..2662600837c7c04b596dd1188ddb462d89f2c62d 100644 (file)
--- a/src/server/httpd.c
+++ b/src/server/httpd.c
@@ -34,7 +34,7 @@
 #include <pthread.h>
 #include <signal.h>
 
-#define PAGE_NOT_FOUND "<html><head><title>File not found</title></head><body>File not found</body></html>"
+#define PAGE_NOT_FOUND "<html><head><title > File not found</title></head><body > File not found</body></html>"
 
 int loadFile(const char *name, void **data, size_t *len);
 
@@ -71,7 +71,7 @@ static const char *httpd_exec_cgi_tcl_error(Jim_Interp *interp)
 
        t = appendf(t, "Runtime error, file \"%s\", line %d:<br>",
                        interp->errorFileName, interp->errorLine);
-       t = appendf(t, "    %s<br>", Jim_GetString(interp->result, NULL));
+       t = appendf(t, "    %s < br>", Jim_GetString(interp->result, NULL));
        Jim_ListLength(interp, interp->stackTrace, &len);
        for (i = 0; i < len; i += 3)
        {
@@ -84,7 +84,7 @@ static const char *httpd_exec_cgi_tcl_error(Jim_Interp *interp)
                file = Jim_GetString(objPtr, NULL);
                Jim_ListIndex(interp, interp->stackTrace, i + 2, &objPtr, JIM_NONE);
                line = Jim_GetString(objPtr, NULL);
-               t = appendf(t, "In procedure '%s' called at file \"%s\", line %s<br>",
+               t = appendf(t, "In procedure '%s' called at file \"%s\", line %s < br>",
                                proc, file, line);
        }
        t = appendf(t, "</html></body>\n");
@@ -111,7 +111,7 @@ static int httpd_Jim_Command_writeform(Jim_Interp *interp, int argc,
 
        const char *script = alloc_printf("set dummy_val $httppostdata(%s); set dummy_val",
                        name);
-       retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__ );
+       retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__);
        free((void *) script);
        if (retcode != JIM_OK)
                return retcode;
@@ -142,7 +142,7 @@ httpd_Jim_Command_formfetch(Jim_Interp *interp,
                                    int argc,
                                    Jim_Obj *const *argv)
 {
-    if (argc!=2)
+    if (argc != 2)
     {
         Jim_WrongNumArgs(interp, 1, argv, "method ?args ...?");
         return JIM_ERR;
@@ -152,7 +152,7 @@ httpd_Jim_Command_formfetch(Jim_Interp *interp,
 
     const char *script = alloc_printf("set dummy_val $httppostdata(%s); set dummy_val",
                        name);
-       int retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__ );
+       int retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__);
        free((void *) script);
        if (retcode != JIM_OK)
        {
@@ -202,7 +202,7 @@ static void append_key(struct httpd_request *r, const char *key,
 
        Jim_Obj *dict = Jim_GetVariableStr(interp, "httppostdata", 0);
 
-       if (dict!=NULL)
+       if (dict != NULL)
        {
                if (Jim_DictKey(interp, dict, keyObj, &value, 0) != JIM_OK)
                {
@@ -257,7 +257,7 @@ int handle_request(struct MHD_Connection * connection, const char * url)
 
                const char *script = alloc_printf(
                                "global httpdata; source {%s}; set httpdata", url);
-               retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__ );
+               retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__);
                free((void *) script);
 
                if (retcode == JIM_ERR)
@@ -307,7 +307,7 @@ int handle_request(struct MHD_Connection * connection, const char * url)
                        return ret;
                }
 
-               LOG_DEBUG("Serving %s length=%u", url, len);
+               LOG_DEBUG("Serving %s length=%zu", url, len);
                /* serve file directly */
                response = MHD_create_response_from_data(len, data, MHD_YES, MHD_NO);
                MHD_add_response_header(response, "Content-Type", "image/png");
@@ -393,7 +393,7 @@ static int ahc_echo(void * cls, struct MHD_Connection * connection,
         * being subverted to evil purposes
         */
 
-       const char *httpd_dir=PKGLIBDIR "/httpd";
+       const char *httpd_dir = PKGDATADIR "/httpd";
 
        if (*url=='/')
        {
@@ -402,7 +402,7 @@ static int ahc_echo(void * cls, struct MHD_Connection * connection,
        if (!*url)
                url="index.tcl";
 
-       const char *file_name=alloc_printf("%s/%s", httpd_dir, url);
+       const char *file_name = alloc_printf("%s/%s", httpd_dir, url);
        int result = handle_request(connection, file_name);
        free((void *)file_name);
        return result;
@@ -415,8 +415,8 @@ static pthread_mutex_t mutex;
 int httpd_start(void)
 {
        pthread_mutexattr_t attr;
-       pthread_mutexattr_init( &attr );
-       pthread_mutex_init( &mutex, &attr );
+       pthread_mutexattr_init(&attr);
+       pthread_mutex_init(&mutex, &attr);
 
        int port = 8888;
        LOG_USER("Launching httpd server on port %d", port);
@@ -446,16 +446,16 @@ int httpd_start(void)
 void httpd_stop(void)
 {
        MHD_stop_daemon(d);
-       pthread_mutex_destroy( &mutex );
+       pthread_mutex_destroy(&mutex);
 }
 
 void openocd_sleep_prelude(void)
 {
-       pthread_mutex_unlock( &mutex );
+       pthread_mutex_unlock(&mutex);
 }
 
 void openocd_sleep_postlude(void)
 {
-       pthread_mutex_lock( &mutex );
+       pthread_mutex_lock(&mutex);
 }
 
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)