at91sam3: fix warnings

- reduce scope of variables
- assert on post condition to fix clang warning

Change-Id: Id91038f73a632f9688ba52c9c34eae923626e770
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Reviewed-on: http://openocd.zylin.com/160
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>

diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index c46829eff6933ed297abccadefc3ac63bf9ce282..43db51d8bf6469304b69dab716329443aa0ec8e6 100644 (file)
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -2926,6 +2926,10 @@ sam3_write(struct flash_bank *bank,
                page_cur++;
        }
 
+       /* By checking that offset is correct here, we also
+       fix a clang warning */
+       assert(offset == pPrivate->page_size);
+
        // intermediate large pages
        // also - the final *terminal*
        // if that terminal page is a full page
@@ -2972,14 +2976,13 @@ sam3_write(struct flash_bank *bank,
 COMMAND_HANDLER(sam3_handle_info_command)
 {
        struct sam3_chip *pChip;
-       unsigned x;
-       int r;
-
        pChip = get_current_sam3(CMD_CTX);
        if (!pChip) {
                return ERROR_OK;
        }
 
+       unsigned x;
+       int r;
        r = 0;
 
        // bank0 must exist before we can do anything