Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 99fe9c8)
cygwin fixes
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Mon, 22 Dec 2008 10:28:11 +0000 (10:28 +0000)
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Mon, 22 Dec 2008 10:28:11 +0000 (10:28 +0000)
git-svn-id: svn://svn.berlios.de/openocd/trunk@1266 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/helper/ioutil.c patch | blob | history
src/server/httpd.c patch | blob | history

diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index 80e43d4ead5b331ef1fc47ea846b2ec28246657a..4711e341f7dd26896347a89cb68ce9085138b48d 100644 (file)
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -62,8 +62,9 @@
 #include <stdio.h>
 #include <string.h>
 
-
+#if !defined(__CYGWIN__)
 #include <ifaddrs.h>
+#endif
 
 #include <unistd.h>
 #include <stdio.h>
@@ -564,6 +565,7 @@ zylinjtag_Jim_Command_poke(Jim_Interp *interp,
 static int zylinjtag_Jim_Command_ip(Jim_Interp *interp, int argc,
                Jim_Obj * const *argv)
 {
+#if !defined(__CYGWIN__)
        Jim_Obj *tclOutput = Jim_NewStringObj(interp, "", 0);
 
        struct ifaddrs *ifa = NULL, *ifp = NULL;
@@ -597,13 +599,14 @@ static int zylinjtag_Jim_Command_ip(Jim_Interp *interp, int argc,
        }
 
        freeifaddrs(ifp);
-
+#else
+       Jim_Obj *tclOutput = Jim_NewStringObj(interp, "fixme!!!", 0);
+#endif
        Jim_SetResult(interp, tclOutput);
 
        return JIM_OK;
 }
 
-
 /* not so pretty code to fish out eth0 mac address */
 static int zylinjtag_Jim_Command_mac(Jim_Interp *interp, int argc,
                Jim_Obj * const *argv)
diff --git a/src/server/httpd.c b/src/server/httpd.c
index f36cf437905bbadb9a093aa43b8f1f1883f204e9..96e338244ba005398f04020adfc90b1eb5b00dd2 100644 (file)
--- a/src/server/httpd.c
+++ b/src/server/httpd.c
@@ -54,7 +54,7 @@
 
 #define PAGE_NOT_FOUND "<html><head><title>File not found</title></head><body>File not found</body></html>"
 
-static const char *appendf(const *prev, const char *format, ...)
+static const char *appendf(const char *prev, const char *format, ...)
 {
        va_list ap;
        va_start(ap, format);
@@ -69,7 +69,7 @@ static const char *appendf(const *prev, const char *format, ...)
 
        if (prev != NULL)
        {
-               free(prev);
+               free((void *)prev);
        }
 
        if (string == NULL)
@@ -120,7 +120,7 @@ static int httpd_Jim_Command_writeform(Jim_Interp *interp, int argc,
        char *file = (char*) Jim_GetString(argv[2], NULL);
 
        // Find length
-       char *data;
+       const char *data;
        int actual;
 
        int retcode;
@@ -449,9 +449,11 @@ void httpd_stop(void)
 
 void openocd_sleep_prelude(void)
 {
+       /* FIX!!!! add locking here!!!! */
 }
 
 void openocd_sleep_postlude(void)
 {
+       /* FIX!!!! add locking here!!!! */
 }
 
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)