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/helper | |
| 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/helper')
| -rw-r--r-- | src/helper/fileio.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/helper/fileio.c b/src/helper/fileio.c index 8f2ce220..71e807ff 100644 --- 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; |