fileio: fileio_size() can now fail

[openocd.git] / src / flash / mflash.c

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 272127be5746af38a1cd1a206f167557969fa2c6..ba34422237d10cd3c6ac9e1f6e3a30a59f7e5f96 100644 (file)
--- 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);