From f988ee566c1ea21fb23515deb8b0e1c238b17594 Mon Sep 17 00:00:00 2001 From: Cyril Bur Date: Fri, 28 Jul 2017 16:46:31 +1000 Subject: external/pflash: Move write and read size calculation together Very simple rework, makes sense to calculate those at the same time. Signed-off-by: Cyril Bur Reviewed-by: Samuel Mendoza-Jonas Signed-off-by: Stewart Smith --- external/pflash/pflash.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/external/pflash/pflash.c b/external/pflash/pflash.c index c0d9686..e917a2a 100644 --- a/external/pflash/pflash.c +++ b/external/pflash/pflash.c @@ -884,19 +884,6 @@ int main(int argc, char *argv[]) goto out; } - /* If file specified but not size, get size from file - */ - if (write_file && !write_size) { - struct stat stbuf; - - if (stat(write_file, &stbuf)) { - perror("Failed to get file size"); - rc = 1; - goto out; - } - write_size = stbuf.st_size; - } - if (tune && !direct) { fprintf(stderr, "It doesn't make sense to --tune without --direct\n"); rc = 1; @@ -937,6 +924,17 @@ int main(int argc, char *argv[]) goto out; } + /* If file specified but not size, get size from file */ + if (write_file && !write_size) { + struct stat stbuf; + + if (stat(write_file, &stbuf)) { + perror("Failed to get file size"); + rc = 1; + goto out; + } + write_size = stbuf.st_size; + } /* If read specified and no read_size, use flash size */ if (do_read && !read_size && !part_name) -- cgit v1.1