flash/nor: improved API of flash_driver.info & fixed buffer overruns

[openocd.git] / src / flash / nor / at91sam3.c

diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index 1e2a074aa80b122892eb0c941bfb34dff3e82695..e0c779a33d8c6dfffad326e88e3914d294868fb7 100644 (file)
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -256,7 +256,7 @@ static struct sam3_chip *get_current_sam3(struct command_invocation *cmd)
 
        t = get_current_target(cmd->ctx);
        if (!t) {
-               command_print(cmd, "No current target?");
+               command_print_sameline(cmd, "No current target?\n");
                return NULL;
        }
 
@@ -264,7 +264,7 @@ static struct sam3_chip *get_current_sam3(struct command_invocation *cmd)
        if (!p) {
                /* this should not happen */
                /* the command is not registered until the chip is created? */
-               command_print(cmd, "No SAM3 chips exist?");
+               command_print_sameline(cmd, "No SAM3 chips exist?\n");
                return NULL;
        }
 
@@ -273,7 +273,7 @@ static struct sam3_chip *get_current_sam3(struct command_invocation *cmd)
                        return p;
                p = p->next;
        }
-       command_print(cmd, "Cannot find SAM3 chip?");
+       command_print_sameline(cmd, "Cannot find SAM3 chip?\n");
        return NULL;
 }
 
@@ -3099,7 +3099,7 @@ FLASH_BANK_COMMAND_HANDLER(sam3_flash_bank_command)
  * is owned by this bank. This simplification works only for one shot
  * deallocation like current flash_free_all_banks()
  */
-void sam3_free_driver_priv(struct flash_bank *bank)
+static void sam3_free_driver_priv(struct flash_bank *bank)
 {
        struct sam3_chip *chip = all_sam3_chips;
        while (chip) {
@@ -3530,8 +3530,7 @@ static int sam3_write(struct flash_bank *bank,
        LOG_DEBUG("Done!");
        r = ERROR_OK;
 done:
-       if (pagebuffer)
-               free(pagebuffer);
+       free(pagebuffer);
        return r;
 }