Fix compile problem in cmd_flash.c

Patch by Teun Grinwis, 05 Aug 2005

Fix compile problem in cmd_flash.c
Patch by Teun Grinwis, 05 Aug 2005
Wolfgang Denk
1 parent 452f67407b
Showing 1 changed file with 5 additions and 3 deletions Side-by-side Diff
common/cmd_flash.c
@@ -116,12 +116,13 @@
 static int
 addr_spec(char *arg1, char *arg2, ulong *addr_first, ulong *addr_last)
 {
+	char len_used = 0; /* indicates if the "start +length" form used */
 	char *ep;
+
 	*addr_first = simple_strtoul(arg1, &ep, 16);
 	if (ep == arg1 || *ep != '\0')
 		return -1;
  
-	char len_used = 0; /* indicates if the "start +length" form used */
 	if (arg2 && *arg2 == '+'){
 		len_used = 1;
 		++arg2;
@@ -132,6 +133,9 @@
 		return -1;
  
 	if (len_used){
+		char found = 0;
+		ulong bank;
+
 		/*
 		 * *addr_last has the length, compute correct *addr_last
 		 * XXX watch out for the integer overflow! Right now it is
@@ -146,8 +150,6 @@
 		 */
  
 		/* find the end addr of the sector where the *addr_last is */
-		char found = 0;
-		ulong bank;
 		for (bank = 0; bank < CFG_MAX_FLASH_BANKS && !found; ++bank){
 			int i;
 			flash_info_t *info = &flash_info[bank];
...	...	@@ -116,12 +116,13 @@
116	116	static int
117	117	addr_spec(char arg1, char arg2, ulong addr_first, ulong addr_last)
118	118	{
	119	+ char len_used = 0; /* indicates if the "start +length" form used */
119	120	char *ep;
	121	+
120	122	*addr_first = simple_strtoul(arg1, &ep, 16);
121	123	if (ep == arg1 \|\| *ep != '\0')
122	124	return -1;
123	125
124		- char len_used = 0; /* indicates if the "start +length" form used */
125	126	if (arg2 && *arg2 == '+'){
126	127	len_used = 1;
127	128	++arg2;
...	...	@@ -132,6 +133,9 @@
132	133	return -1;
133	134
134	135	if (len_used){
	136	+ char found = 0;
	137	+ ulong bank;
	138	+
135	139	/*
136	140	* addr_last has the length, compute correct addr_last
137	141	* XXX watch out for the integer overflow! Right now it is
...	...	@@ -146,8 +150,6 @@
146	150	*/
147	151
148	152	/* find the end addr of the sector where the addr_last is /
149		- char found = 0;
150		- ulong bank;
151	153	for (bank = 0; bank < CFG_MAX_FLASH_BANKS && !found; ++bank){
152	154	int i;
153	155	flash_info_t *info = &flash_info[bank];