diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-06-14 11:51:25 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-06-14 22:12:04 +0200 |
| commit | 3e51d893ed3d1273b5487e05196f00fe3d14773d (patch) | |
| tree | f542745888ce0d12132e88a319ccdac275ac42ea /src/flash | |
| parent | 9132f7083d01510eb1c2471a7c3f3247e35cdf3b (diff) | |
| download | openocd+libswd-3e51d893ed3d1273b5487e05196f00fe3d14773d.tar.gz openocd+libswd-3e51d893ed3d1273b5487e05196f00fe3d14773d.tar.bz2 openocd+libswd-3e51d893ed3d1273b5487e05196f00fe3d14773d.tar.xz openocd+libswd-3e51d893ed3d1273b5487e05196f00fe3d14773d.zip | |
-Wshadow fixes
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/flash')
| -rw-r--r-- | src/flash/common.c | 8 | ||||
| -rw-r--r-- | src/flash/nand/lpc3180.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/flash/common.c b/src/flash/common.c index 17bc81c2..46cb243e 100644 --- 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 40324f28..93d00d5c 100644 --- 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; |