diff options
| author | Marc Schink <openocd-dev@marcschink.de> | 2015-10-04 17:18:40 +0200 |
|---|---|---|
| committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2016-02-29 21:04:47 +0000 |
| commit | 73b676c2fdedcb913f1c20be7de99ea0a94b11cc (patch) | |
| tree | 1b83325ff1fe0aef54d659c8b83378784347919a /src/flash/mflash.c | |
| parent | 7c957b601f7aeabc537519597057e63f2ae60320 (diff) | |
helper/fileio: Remove nested struct
Change-Id: I1a3afbddcf950689da58e0df8850a05f558d7879
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/3222
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Diffstat (limited to 'src/flash/mflash.c')
| -rw-r--r-- | src/flash/mflash.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/flash/mflash.c b/src/flash/mflash.c index 6f4a988e..d3a3acea 100644 --- a/src/flash/mflash.c +++ b/src/flash/mflash.c @@ -749,7 +749,7 @@ COMMAND_HANDLER(mg_write_cmd) { uint32_t address, cnt, res, i; uint8_t *buffer; - struct fileio fileio; + struct fileio *fileio; int ret; if (CMD_ARGC != 3) @@ -764,12 +764,12 @@ COMMAND_HANDLER(mg_write_cmd) size_t filesize; buffer = malloc(MG_FILEIO_CHUNK); if (!buffer) { - fileio_close(&fileio); + fileio_close(fileio); return ERROR_FAIL; } - int retval = fileio_size(&fileio, &filesize); + int retval = fileio_size(fileio, &filesize); if (retval != ERROR_OK) { - fileio_close(&fileio); + fileio_close(fileio); free(buffer); return retval; } @@ -782,7 +782,7 @@ COMMAND_HANDLER(mg_write_cmd) size_t buf_cnt; for (i = 0; i < cnt; i++) { - ret = fileio_read(&fileio, MG_FILEIO_CHUNK, buffer, &buf_cnt); + ret = fileio_read(fileio, MG_FILEIO_CHUNK, buffer, &buf_cnt); if (ret != ERROR_OK) goto mg_write_cmd_err; ret = mg_mflash_write(address, buffer, MG_FILEIO_CHUNK); @@ -792,7 +792,7 @@ COMMAND_HANDLER(mg_write_cmd) } if (res) { - ret = fileio_read(&fileio, res, buffer, &buf_cnt); + ret = fileio_read(fileio, res, buffer, &buf_cnt); if (ret != ERROR_OK) goto mg_write_cmd_err; ret = mg_mflash_write(address, buffer, res); @@ -807,13 +807,13 @@ COMMAND_HANDLER(mg_write_cmd) } free(buffer); - fileio_close(&fileio); + fileio_close(fileio); return ERROR_OK; mg_write_cmd_err: free(buffer); - fileio_close(&fileio); + fileio_close(fileio); return ret; } @@ -822,7 +822,7 @@ COMMAND_HANDLER(mg_dump_cmd) { uint32_t address, size, cnt, res, i; uint8_t *buffer; - struct fileio fileio; + struct fileio *fileio; int ret; if (CMD_ARGC != 4) @@ -837,7 +837,7 @@ COMMAND_HANDLER(mg_dump_cmd) buffer = malloc(MG_FILEIO_CHUNK); if (!buffer) { - fileio_close(&fileio); + fileio_close(fileio); return ERROR_FAIL; } @@ -852,7 +852,7 @@ COMMAND_HANDLER(mg_dump_cmd) ret = mg_mflash_read(address, buffer, MG_FILEIO_CHUNK); if (ret != ERROR_OK) goto mg_dump_cmd_err; - ret = fileio_write(&fileio, MG_FILEIO_CHUNK, buffer, &size_written); + ret = fileio_write(fileio, MG_FILEIO_CHUNK, buffer, &size_written); if (ret != ERROR_OK) goto mg_dump_cmd_err; address += MG_FILEIO_CHUNK; @@ -862,7 +862,7 @@ COMMAND_HANDLER(mg_dump_cmd) ret = mg_mflash_read(address, buffer, res); if (ret != ERROR_OK) goto mg_dump_cmd_err; - ret = fileio_write(&fileio, res, buffer, &size_written); + ret = fileio_write(fileio, res, buffer, &size_written); if (ret != ERROR_OK) goto mg_dump_cmd_err; } @@ -875,13 +875,13 @@ COMMAND_HANDLER(mg_dump_cmd) } free(buffer); - fileio_close(&fileio); + fileio_close(fileio); return ERROR_OK; mg_dump_cmd_err: free(buffer); - fileio_close(&fileio); + fileio_close(fileio); return ret; } |