From f4d82deb36b857c6d60d9f31b60d58665a8d6216 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Sun, 28 Dec 2008 21:40:39 +0000
Subject: [PATCH] Uwe Hermann <uwe@hermann-uwe.de> One of them is fixing a few
 compiler warnings (see attached patch) and 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
---
 src/flash/nand.c    | 2 +-
 src/helper/jim.c    | 1 +
 src/jtag/usbprog.c  | 4 ++--
 src/target/target.c | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/flash/nand.c b/src/flash/nand.c
index 971956e8e..7f9140759 100644
--- 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 f4336ae24..a43bcbd62 100644
--- 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 419ad4e06..be0501185 100644
--- 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 f86d8f397..bafd98e9d 100644
--- 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)
 	{