auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fileio: fileio_size() can now fail

Browse Source 
Part of making the fileio API more robust.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
This commit is contained in:
Øyvind Harboe
2010-09-29 09:11:01 +02:00
parent 3a693ef526
commit 3931b99d14
9 changed files with 92 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/flash/nand/fileio.c
View File

@@ -180,7 +180,13 @@ COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
return retval;
if (!need_size)
state->size = fileio_size(&state->fileio);
{
int filesize;
retval = fileio_size(&state->fileio, &filesize);
if (retval != ERROR_OK)
return retval;
state->size = filesize;
}
*dev = nand;

9
src/flash/nand/tcl.c
View File

@@ -388,9 +388,14 @@ COMMAND_HANDLER(handle_nand_dump_command)
if (nand_fileio_finish(&s) == ERROR_OK)
{
int filesize;
retval = fileio_size(&s.fileio, &filesize);
if (retval != ERROR_OK)
return retval;
command_print(CMD_CTX, "dumped %ld bytes in %fs (%0.3f KiB/s)",
(long)fileio_size(&s.fileio), duration_elapsed(&s.bench),
duration_kbps(&s.bench, fileio_size(&s.fileio)));
(long)filesize, duration_elapsed(&s.bench),
duration_kbps(&s.bench, filesize));
}
return ERROR_OK;
}