From 5444410e04ad9b6c59c234e81b6ec6b9e7caf08e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 6 Nov 2017 15:44:35 +0100 Subject: [PATCH] unix: use return value from fread properly --- embed/unix/flash.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/embed/unix/flash.c b/embed/unix/flash.c index 578e49040..1a9a74917 100644 --- a/embed/unix/flash.c +++ b/embed/unix/flash.c @@ -55,20 +55,17 @@ static void flash_sync(void) } } -static void flash_read(void) +secbool flash_init(void) { FILE *f = fopen(FLASH_FILE, "rb"); + size_t r = 0; if (f) { - size_t r = fread(flash_buffer, sizeof(flash_buffer), 1, f); - (void)r; + r = fread(flash_buffer, sizeof(flash_buffer), 1, f); fclose(f); } -} - -secbool flash_init(void) -{ - memset(flash_buffer, 0xFF, sizeof(flash_buffer)); - flash_read(); + if (r != 1) { + memset(flash_buffer, 0xFF, sizeof(flash_buffer)); + } return sectrue; }