-Wshadow fixes

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>

diff --git a/src/flash/common.c b/src/flash/common.c
index 17bc81c2a76c0756ed7cced3e9ae2758a18a4847..46cb243e1c2ab354e8b606be94402bee9e369ef4 100644 (file)
--- a/src/flash/common.c
+++ b/src/flash/common.c
@@ -25,13 +25,13 @@
 
 unsigned get_flash_name_index(const char *name)
 {
-       const char *index = strrchr(name, '.');
-       if (NULL == index)
+       const char *name_index = strrchr(name, '.');
+       if (NULL == name_index)
                return 0;
-       if (index[1] < '0' || index[1] > '9')
+       if (name_index[1] < '0' || name_index[1] > '9')
                return ~0U;
        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
        return (ERROR_OK == retval) ? requested : ~0U;
 }

diff --git a/src/flash/nand/lpc3180.c b/src/flash/nand/lpc3180.c
index 40324f2854ea910fe0c650cbf31c4130fcf6af7a..93d00d5c8415db91e0287c2cb079f56499a4e9d7 100644 (file)
--- a/src/flash/nand/lpc3180.c
+++ b/src/flash/nand/lpc3180.c
@@ -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;
                struct working_area *pworking_area;
     

diff --git a/src/helper/fileio.c b/src/helper/fileio.c
index 8f2ce220473f74402645a4f413935cb1b6a042ee..71e807ff7870a7aa4e992de1c7d42180acbb28b5 100644 (file)
--- a/src/helper/fileio.c
+++ b/src/helper/fileio.c
@@ -33,24 +33,24 @@
 
 static inline int fileio_open_local(struct fileio *fileio)
 {
-       char access[4];
+       char file_access[4];
 
        switch (fileio->access)
        {
                case FILEIO_READ:
-                       strcpy(access, "r");
+                       strcpy(file_access, "r");
                        break;
                case FILEIO_WRITE:
-                       strcpy(access, "w");
+                       strcpy(file_access, "w");
                        break;
                case FILEIO_READWRITE:
-                       strcpy(access, "w+");
+                       strcpy(file_access, "w+");
                        break;
                case FILEIO_APPEND:
-                       strcpy(access, "a");
+                       strcpy(file_access, "a");
                        break;
                case FILEIO_APPENDREAD:
-                       strcpy(access, "a+");
+                       strcpy(file_access, "a+");
                        break;
                default:
                        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)
 #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);
                return ERROR_FILEIO_OPERATION_FAILED;

diff --git a/src/server/server.c b/src/server/server.c
index 57c4016231e6d2313c6cb252daf4e241e42d3505..7d8ad51795a10fe423c9de36b9b5b43e77d52f99 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -264,7 +264,7 @@ int server_loop(struct command_context *command_context)
 {
        struct service *service;
 
-       bool poll = true;
+       bool poll_ok = true;
 
        /* used in select() */
        fd_set read_fds;
@@ -322,7 +322,7 @@ int server_loop(struct command_context *command_context)
 
                struct timeval tv;
                tv.tv_sec = 0;
-               if (poll)
+               if (poll_ok)
                {
                        /* we're just polling this iteration, this is faster on embedded
                         * 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!  */
 
                        /* We timed out/there was nothing to do, timeout rather than poll next time */
-                       poll = false;
+                       poll_ok = false;
                } else
                {
                        /* There was something to do, next time we'll just poll */
-                       poll = true;
+                       poll_ok = true;
                }
 
                for (service = services; service; service = service->next)