From 082c8b559cd9f3262c9af58ac2f17f2cc8a09d8b Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Mon, 15 Aug 2011 19:54:20 +0000 Subject: Fixup of r1397 - Mixing uninitialized and initialized local variables leads to confusion. - ft2232_spi error cases should have gotten some error handling, and that's the reason the curly braces were there. - Fixing typos/wording in some places would have been nice given that those places were touched anyway. Corresponding to flashrom svn r1413. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Stefan Tauner --- cli_classic.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cli_classic.c') diff --git a/cli_classic.c b/cli_classic.c index 22711b0..5d35738 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -104,13 +104,14 @@ int cli_classic(int argc, char *argv[]) struct flashchip flashes[3]; struct flashchip *fill_flash; const char *name; - int startchip = 0, chipcount = 0, namelen, opt, option_index = 0; - int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0; - int dont_verify_it = 0, list_supported = 0, force = 0; + int namelen, opt, i; + int startchip = 0, chipcount = 0, option_index = 0, force = 0; #if CONFIG_PRINT_WIKI == 1 int list_supported_wiki = 0; #endif - int operation_specified = 0, i, ret = 0; + int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0; + int dont_verify_it = 0, list_supported = 0, operation_specified = 0; + int ret = 0; static const char optstring[] = "r:Rw:v:nVEfc:m:l:i:p:Lzh"; static const struct option long_options[] = { -- cgit v1.1