[Openocd-svn] r1293 - in trunk/src: flash helper jtag target

[<oh...@ma...>]

Author: oharboe
Date: 2008-12-28 22:40:39 +0100 (Sun, 28 Dec 2008)
New Revision: 1293

Modified:
   trunk/src/flash/nand.c
   trunk/src/helper/jim.c
   trunk/src/jtag/usbprog.c
   trunk/src/target/target.c
Log:
Uwe Hermann <uw...@he...> 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).

Modified: trunk/src/flash/nand.c
===================================================================
--- trunk/src/flash/nand.c	2008-12-28 10:58:34 UTC (rev 1292)
+++ trunk/src/flash/nand.c	2008-12-28 21:40:39 UTC (rev 1293)
@@ -375,7 +375,7 @@
 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;
 

Modified: trunk/src/helper/jim.c
===================================================================
--- trunk/src/helper/jim.c	2008-12-28 10:58:34 UTC (rev 1292)
+++ trunk/src/helper/jim.c	2008-12-28 21:40:39 UTC (rev 1293)
@@ -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>

Modified: trunk/src/jtag/usbprog.c
===================================================================
--- trunk/src/jtag/usbprog.c	2008-12-28 10:58:34 UTC (rev 1292)
+++ trunk/src/jtag/usbprog.c	2008-12-28 21:40:39 UTC (rev 1293)
@@ -93,7 +93,7 @@
 
 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 @@
 
 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;

Modified: trunk/src/target/target.c
===================================================================
--- trunk/src/target/target.c	2008-12-28 10:58:34 UTC (rev 1292)
+++ trunk/src/target/target.c	2008-12-28 21:40:39 UTC (rev 1293)
@@ -4014,7 +4014,7 @@
 static int fastload_num;
 static struct FastLoad *fastload;
 
-static void free_fastload()
+static void free_fastload(void)
 {
 	if (fastload!=NULL)
 	{