From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Thu, 18 Jun 2009 13:35:18 +0000 (+0000)
Subject: less warnings
X-Git-Tag: v0.2.0~228
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8f87f8945e4919b9561d8ba8e21f88fbddc76383;p=openocd

less warnings

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

diff --git a/src/ecosboard.c b/src/ecosboard.c
index 0b1bf36e..d49abbd1 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -296,18 +296,16 @@ void format(void)
 	}
 
 	cyg_io_flash_getconfig_erase_t e;
-	void *err_addr;
 	len = sizeof(e);
 
 	e.offset = 0;
 	e.len = ds.dev_size;
-	e.err_address = &err_addr;
 
 	diag_printf("Formatting 0x%08x bytes\n", (int)ds.dev_size);
 	err = cyg_io_get_config(handle, CYG_IO_GET_CONFIG_FLASH_ERASE, &e, &len);
 	if (err != ENOERR)
 	{
-		diag_printf("Flash erase error %d offset 0x%p\n", err, err_addr);
+		diag_printf("Flash erase error %d offset 0x%p\n", err, e.err_address);
 		reboot();
 	}
 
@@ -633,9 +631,9 @@ static void zylinjtag_uart(cyg_addrword_t data)
 #ifdef CYGPKG_PROFILE_GPROF
 		start_profile();
 #endif
-		int actual = 0;
-		int actual2 = 0;
-		int pos, pos2;
+		size_t actual = 0;
+		size_t actual2 = 0;
+		size_t pos, pos2;
 		pos = 0;
 		pos2 = 0;
 		cur = 0;
@@ -668,9 +666,11 @@ static void zylinjtag_uart(cyg_addrword_t data)
 			if (actual2 <= 0)
 			{
 				memset(backwardBuffer, 's', sizeof(backwardBuffer));
-				actual2 = read(serHandle, backwardBuffer,
+				int t;
+				t = read(serHandle, backwardBuffer,
 						sizeof(backwardBuffer));
-				if (actual2 < 0)
+				actual2 = t;
+				if (t < 0)
 				{
 					if (errno != EAGAIN)
 					{
@@ -681,8 +681,8 @@ static void zylinjtag_uart(cyg_addrword_t data)
 				pos2 = 0;
 			}
 
-			int x = actual2;
-			int y = 0;
+			size_t x = actual2;
+			size_t y = 0;
 			if (actual2 > 0)
 			{
 				int written = write(session, backwardBuffer + pos2, actual2);