diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-09-29 09:11:01 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-09-29 18:56:07 +0200 |
| commit | 3931b99d142d337ea6558fd09aad2e0812c04507 (patch) | |
| tree | 20ca8392b75964e038b941b607dcce8162513b2d /src/flash/mflash.c | |
| parent | 3a693ef526575633cc350a69aa1a5d1f08e64c46 (diff) | |
| download | openocd+libswd-3931b99d142d337ea6558fd09aad2e0812c04507.tar.gz openocd+libswd-3931b99d142d337ea6558fd09aad2e0812c04507.tar.bz2 openocd+libswd-3931b99d142d337ea6558fd09aad2e0812c04507.tar.xz openocd+libswd-3931b99d142d337ea6558fd09aad2e0812c04507.zip | |
fileio: fileio_size() can now fail
Part of making the fileio API more robust.
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/flash/mflash.c')
| -rw-r--r-- | src/flash/mflash.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/flash/mflash.c b/src/flash/mflash.c index 272127be..ba344222 100644 --- a/src/flash/mflash.c +++ b/src/flash/mflash.c @@ -720,14 +720,20 @@ COMMAND_HANDLER(mg_write_cmd) if (ret != ERROR_OK) return ret; + int filesize; buffer = malloc(MG_FILEIO_CHUNK); if (!buffer) { fileio_close(&fileio); return ERROR_FAIL; } + int retval = fileio_size(&fileio, &filesize); + if (retval != ERROR_OK) { + fileio_close(&fileio); + return retval; + } - cnt = fileio_size(&fileio) / MG_FILEIO_CHUNK; - res = fileio_size(&fileio) % MG_FILEIO_CHUNK; + cnt = filesize / MG_FILEIO_CHUNK; + res = filesize % MG_FILEIO_CHUNK; struct duration bench; duration_start(&bench); @@ -752,8 +758,8 @@ COMMAND_HANDLER(mg_write_cmd) if (duration_measure(&bench) == ERROR_OK) { command_print(CMD_CTX, "wrote %ld bytes from file %s " - "in %fs (%0.3f kB/s)", (long)fileio_size(&fileio), CMD_ARGV[1], - duration_elapsed(&bench), duration_kbps(&bench, fileio_size(&fileio))); + "in %fs (%0.3f kB/s)", (long)filesize, CMD_ARGV[1], + duration_elapsed(&bench), duration_kbps(&bench, filesize)); } free(buffer); |