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/nor/tcl.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/nor/tcl.c')
| -rw-r--r-- | src/flash/nor/tcl.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c index 8a30e1cd..cf0daf34 100644 --- a/src/flash/nor/tcl.c +++ b/src/flash/nor/tcl.c @@ -555,7 +555,7 @@ COMMAND_HANDLER(handle_flash_write_bank_command) { uint32_t offset; uint8_t *buffer; - struct fileio fileio; + struct fileio *fileio; if (CMD_ARGC != 3) return ERROR_COMMAND_SYNTAX_ERROR; @@ -574,22 +574,22 @@ COMMAND_HANDLER(handle_flash_write_bank_command) return ERROR_OK; size_t filesize; - retval = fileio_size(&fileio, &filesize); + retval = fileio_size(fileio, &filesize); if (retval != ERROR_OK) { - fileio_close(&fileio); + fileio_close(fileio); return retval; } buffer = malloc(filesize); if (buffer == NULL) { - fileio_close(&fileio); + fileio_close(fileio); LOG_ERROR("Out of memory"); return ERROR_FAIL; } size_t buf_cnt; - if (fileio_read(&fileio, filesize, buffer, &buf_cnt) != ERROR_OK) { + if (fileio_read(fileio, filesize, buffer, &buf_cnt) != ERROR_OK) { free(buffer); - fileio_close(&fileio); + fileio_close(fileio); return ERROR_OK; } @@ -605,7 +605,7 @@ COMMAND_HANDLER(handle_flash_write_bank_command) duration_elapsed(&bench), duration_kbps(&bench, filesize)); } - fileio_close(&fileio); + fileio_close(fileio); return retval; } @@ -614,7 +614,7 @@ COMMAND_HANDLER(handle_flash_read_bank_command) { uint32_t offset; uint8_t *buffer; - struct fileio fileio; + struct fileio *fileio; uint32_t length; size_t written; @@ -652,8 +652,8 @@ COMMAND_HANDLER(handle_flash_read_bank_command) return retval; } - retval = fileio_write(&fileio, length, buffer, &written); - fileio_close(&fileio); + retval = fileio_write(fileio, length, buffer, &written); + fileio_close(fileio); free(buffer); if (retval != ERROR_OK) { LOG_ERROR("Could not write file"); @@ -674,7 +674,7 @@ COMMAND_HANDLER(handle_flash_verify_bank_command) { uint32_t offset; uint8_t *buffer_file, *buffer_flash; - struct fileio fileio; + struct fileio *fileio; size_t read_cnt; size_t filesize; int differ; @@ -698,21 +698,21 @@ COMMAND_HANDLER(handle_flash_verify_bank_command) return retval; } - retval = fileio_size(&fileio, &filesize); + retval = fileio_size(fileio, &filesize); if (retval != ERROR_OK) { - fileio_close(&fileio); + fileio_close(fileio); return retval; } buffer_file = malloc(filesize); if (buffer_file == NULL) { LOG_ERROR("Out of memory"); - fileio_close(&fileio); + fileio_close(fileio); return ERROR_FAIL; } - retval = fileio_read(&fileio, filesize, buffer_file, &read_cnt); - fileio_close(&fileio); + retval = fileio_read(fileio, filesize, buffer_file, &read_cnt); + fileio_close(fileio); if (retval != ERROR_OK) { LOG_ERROR("File read failure"); free(buffer_file); |