Uwe Hermann <uwe@hermann-uwe.de> One of them is fixing a few compiler warnings (see...

likely also one (non-cosmetic) bug (the 'id_buff' change, which seems to
be a buffer overflow).

git-svn-id: svn://svn.berlios.de/openocd/trunk@1293 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/flash/nand.c b/src/flash/nand.c
index 971956e8e91954b7ff1c8dd0bb4b2dc84d307d33..7f91407590cf8f1273208a11e21eb022c7b2b63f 100644 (file)
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -375,7 +375,7 @@ int nand_read_status(struct nand_device_s *device, u8 *status)
 int nand_probe(struct nand_device_s *device)
 {
        u8 manufacturer_id, device_id;
-       u8 id_buff[5];
+       u8 id_buff[6];
        int retval;
        int i;
 

diff --git a/src/helper/jim.c b/src/helper/jim.c
index f4336ae244b2a15283f2fd716476ad04babf6155..a43bcbd621ad5279e8d9d2f6e24c363cadfa6202 100644 (file)
--- a/src/helper/jim.c
+++ b/src/helper/jim.c
@@ -49,6 +49,7 @@
 #define JIM_DYNLIB      /* Dynamic library support for UNIX and WIN32 */
 #endif /* JIM_ANSIC */
 
+#define _GNU_SOURCE    /* for vasprintf() */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/jtag/usbprog.c b/src/jtag/usbprog.c
index 419ad4e06fe0816ddba60db35727a6d8b1261080..be0501185979ed7d2bdc9db9d55f4f580d10326f 100644 (file)
--- a/src/jtag/usbprog.c
+++ b/src/jtag/usbprog.c
@@ -93,7 +93,7 @@ struct usbprog_jtag
 
 struct usbprog_jtag * usbprog_jtag_handle;
 
-struct usbprog_jtag* usbprog_jtag_open();
+struct usbprog_jtag* usbprog_jtag_open(void);
 void usbprog_jtag_close(struct usbprog_jtag *usbprog_jtag);
 void usbprog_jtag_init(struct usbprog_jtag *usbprog_jtag);
 unsigned char usbprog_jtag_message(struct usbprog_jtag *usbprog_jtag, char *msg, int msglen);
@@ -405,7 +405,7 @@ void usbprog_reset(int trst, int srst)
 
 struct usb_bus *busses;
 
-struct usbprog_jtag* usbprog_jtag_open()
+struct usbprog_jtag* usbprog_jtag_open(void)
 {
        struct usb_bus *bus;
        struct usb_device *dev;

diff --git a/src/target/target.c b/src/target/target.c
index f86d8f397438e6c83bad665eb12da74538d535b3..bafd98e9dec033025c957aba8f4e931b7116295a 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -4014,7 +4014,7 @@ struct FastLoad
 static int fastload_num;
 static struct FastLoad *fastload;
 
-static void free_fastload()
+static void free_fastload(void)
 {
        if (fastload!=NULL)
        {