Menu
▾
▴
[Openocd-svn] r1266 - in trunk/src: helper server
|
From: <oh...@ma...> - 2008-12-22 11:28:14
|
Author: oharboe
Date: 2008-12-22 11:28:11 +0100 (Mon, 22 Dec 2008)
New Revision: 1266
Modified:
trunk/src/helper/ioutil.c
trunk/src/server/httpd.c
Log:
cygwin fixes
Modified: trunk/src/helper/ioutil.c
===================================================================
--- trunk/src/helper/ioutil.c 2008-12-22 10:27:53 UTC (rev 1265)
+++ trunk/src/helper/ioutil.c 2008-12-22 10:28:11 UTC (rev 1266)
@@ -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 @@
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 @@
}
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)
Modified: trunk/src/server/httpd.c
===================================================================
--- trunk/src/server/httpd.c 2008-12-22 10:27:53 UTC (rev 1265)
+++ trunk/src/server/httpd.c 2008-12-22 10:28:11 UTC (rev 1266)
@@ -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 @@
if (prev != NULL)
{
- free(prev);
+ free((void *)prev);
}
if (string == NULL)
@@ -120,7 +120,7 @@
char *file = (char*) Jim_GetString(argv[2], NULL);
// Find length
- char *data;
+ const char *data;
int actual;
int retcode;
@@ -449,9 +449,11 @@
void openocd_sleep_prelude(void)
{
+ /* FIX!!!! add locking here!!!! */
}
void openocd_sleep_postlude(void)
{
+ /* FIX!!!! add locking here!!!! */
}
|
