interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

-Wshadow fixes 

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
This commit is contained in:
Øyvind Harboe 2010-06-14 11:51:25 +02:00
parent 9132f7083d
commit 3e51d893ed
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/flash/common.c
View File

@ -25,13 +25,13 @@
unsigned get_flash_name_index(const char *name) unsigned get_flash_name_index(const char *name)
{ {
const char *index = strrchr(name, '.'); const char *name_index = strrchr(name, '.');
if (NULL == index) if (NULL == name_index)
return 0; return 0;
if (index[1] < '0' || index[1] > '9') if (name_index[1] < '0' || name_index[1] > '9')
return ~0U; return ~0U;
unsigned requested; unsigned requested;
int retval = parse_uint(index + 1, &requested); int retval = parse_uint(name_index + 1, &requested);
// detect parsing error by forcing past end of bank list // detect parsing error by forcing past end of bank list
return (ERROR_OK == retval) ? requested : ~0U; return (ERROR_OK == retval) ? requested : ~0U;
} }

2
src/flash/nand/lpc3180.c
View File

@ -649,7 +649,7 @@ static int lpc3180_write_page(struct nand_device *nand, uint32_t page, uint8_t *
* *
**********************************************************************/ **********************************************************************/
int retval,i=0,target_mem_base; int i=0,target_mem_base;
uint8_t *ecc_flash_buffer; uint8_t *ecc_flash_buffer;
struct working_area *pworking_area; struct working_area *pworking_area;

16
src/helper/fileio.c
View File

@ -33,24 +33,24 @@
static inline int fileio_open_local(struct fileio *fileio) static inline int fileio_open_local(struct fileio *fileio)
{ {
char access[4]; char file_access[4];
switch (fileio->access) switch (fileio->access)
{ {
case FILEIO_READ: case FILEIO_READ:
strcpy(access, "r"); strcpy(file_access, "r");
break; break;
case FILEIO_WRITE: case FILEIO_WRITE:
strcpy(access, "w"); strcpy(file_access, "w");
break; break;
case FILEIO_READWRITE: case FILEIO_READWRITE:
strcpy(access, "w+"); strcpy(file_access, "w+");
break; break;
case FILEIO_APPEND: case FILEIO_APPEND:
strcpy(access, "a"); strcpy(file_access, "a");
break; break;
case FILEIO_APPENDREAD: case FILEIO_APPENDREAD:
strcpy(access, "a+"); strcpy(file_access, "a+");
break; break;
default: default:
LOG_ERROR("BUG: access neither read, write nor readwrite"); LOG_ERROR("BUG: access neither read, write nor readwrite");
@ -62,10 +62,10 @@ static inline int fileio_open_local(struct fileio *fileio)
if (fileio->type == FILEIO_BINARY) if (fileio->type == FILEIO_BINARY)
#endif #endif
{ {
strcat(access, "b"); strcat(file_access, "b");
} }
if (!(fileio->file = open_file_from_path (fileio->url, access))) if (!(fileio->file = open_file_from_path (fileio->url, file_access)))
{ {
LOG_ERROR("couldn't open %s", fileio->url); LOG_ERROR("couldn't open %s", fileio->url);
return ERROR_FILEIO_OPERATION_FAILED; return ERROR_FILEIO_OPERATION_FAILED;

8
src/server/server.c
View File

@ -264,7 +264,7 @@ int server_loop(struct command_context *command_context)
{ {
struct service *service; struct service *service;
bool poll = true; bool poll_ok = true;
/* used in select() */ /* used in select() */
fd_set read_fds; fd_set read_fds;
@ -322,7 +322,7 @@ int server_loop(struct command_context *command_context)
struct timeval tv; struct timeval tv;
tv.tv_sec = 0; tv.tv_sec = 0;
if (poll) if (poll_ok)
{ {
/* we're just polling this iteration, this is faster on embedded /* we're just polling this iteration, this is faster on embedded
* hosts */ * hosts */
@ -375,11 +375,11 @@ int server_loop(struct command_context *command_context)
FD_ZERO(&read_fds); /* eCos leaves read_fds unchanged in this case! */ FD_ZERO(&read_fds); /* eCos leaves read_fds unchanged in this case! */
/* We timed out/there was nothing to do, timeout rather than poll next time */ /* We timed out/there was nothing to do, timeout rather than poll next time */
poll = false; poll_ok = false;
} else } else
{ {
/* There was something to do, next time we'll just poll */ /* There was something to do, next time we'll just poll */
poll = true; poll_ok = true;
} }
for (service = services; service; service = service->next) for (service = services; service; service = service->next)