From: Spencer Oliver <spen@spen-soft.co.uk>
Date: Mon, 14 Nov 2011 15:43:35 +0000 (+0000)
Subject: build: fix gcc 4.6.2 warnings
X-Git-Tag: v0.6.0-rc1~416
X-Git-Url: https://review.openocd.org/gitweb?a=commitdiff_plain;h=e1500a9c9d0189bc277c79a2ddb35ecb79d1a20e;hp=280e1b334abc051d80e71ace8cec8cca0d663842;p=openocd.git

build: fix gcc 4.6.2 warnings

see trac #47

Change-Id: I48a3e963354dfc82209477672c2508c96fb737d6
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/198
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
---

diff --git a/src/jtag/drivers/amt_jtagaccel.c b/src/jtag/drivers/amt_jtagaccel.c
index a433e81eb6..424019e19d 100644
--- a/src/jtag/drivers/amt_jtagaccel.c
+++ b/src/jtag/drivers/amt_jtagaccel.c
@@ -68,34 +68,26 @@ static const int addr_mode = IEEE1284_MODE_EPP | IEEE1284_ADDR;
 
 #define AMT_AW(val) \
 	do { \
-		int __retval; \
-		\
-		__retval = ioctl(device_handle, PPSETMODE, &addr_mode); \
-		__retval = write(device_handle, &val, 1); \
+		ioctl(device_handle, PPSETMODE, &addr_mode); \
+		write(device_handle, &val, 1); \
 	} while (0)
 #define AMT_AR(val) \
 	do { \
-		int __retval; \
-		\
-		__retval = ioctl(device_handle, PPSETMODE, &addr_mode); \
-		__retval = read(device_handle, &val, 1); \
+		ioctl(device_handle, PPSETMODE, &addr_mode); \
+		read(device_handle, &val, 1); \
 	} while (0)
 
 static const int data_mode = IEEE1284_MODE_EPP | IEEE1284_DATA;
 
 #define AMT_DW(val) \
 	do { \
-		int __retval; \
-		\
-		__retval = ioctl(device_handle, PPSETMODE, &data_mode); \
-		__retval = write(device_handle, &val, 1); \
+		ioctl(device_handle, PPSETMODE, &data_mode); \
+		write(device_handle, &val, 1); \
 	} while (0)
 #define AMT_DR(val) \
 	do { \
-		int __retval; \
-		\
-		__retval = ioctl(device_handle, PPSETMODE, &data_mode); \
-		__retval = read(device_handle, &val, 1); \
+		ioctl(device_handle, PPSETMODE, &data_mode); \
+		read(device_handle, &val, 1); \
 	} while (0)
 
 #else