[Openocd-development] openocd patch: 68f4516 at91sam3: fix warnings

[gerrit]

This is an automated email from Gerrit.

?yvind Harboe (oyvindhar...@gmail.com) just uploaded a new patch set to Gerrit, 
which you can find at http://openocd.zylin.com/160

-- gerrit

commit 68f4516e3aa75a29ed3c16a812e4219209f40fab
Author: Øyvind Harboe <oyvind.har...@zylin.com>
Date:   Thu Nov 3 21:39:23 2011 +0100

    at91sam3: fix warnings
    
    - reduce scope of variables
    - assert on post condition to fix clang warning
    
    Change-Id: Id91038f73a632f9688ba52c9c34eae923626e770
    Signed-off-by: Øyvind Harboe <oyvind.har...@zylin.com>

diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index c46829e..160648f 100644
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -2926,6 +2926,9 @@ 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 +2975,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

-- 

_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development