Fixes from Oleksandr Tymoshenko "gonzo@bluezbox.com"

git-svn-id: svn://svn.berlios.de/openocd/trunk@2401 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/flash/at91sam3.c b/src/flash/at91sam3.c
index 449bcae786d67bc3d84c8966d1859f1c10515e2d..70377ad8870a0ad4c85e81db1f9ad9e747ad1bd6 100644 (file)
--- a/src/flash/at91sam3.c
+++ b/src/flash/at91sam3.c
@@ -2385,6 +2385,7 @@ sam3_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **a
        if (0 == strcmp("show", argv[0])) {
                if (who == -1) {
                showall:
+                       r = ERROR_OK;
                        for (x = 0 ; x < pChip->details.n_gpnvms ; x++) {
                                r = FLASHD_GetGPNVM(&(pChip->details.bank[0]), x, &v);
                                if (r != ERROR_OK) {

diff --git a/src/helper/membuf.c b/src/helper/membuf.c
index 4e25d81a09aa5c2ebcb8ba42bf1c0353dfee9d79..160d0bd7a4e992dedc61065a0a339fd838ce3050 100644 (file)
--- a/src/helper/membuf.c
+++ b/src/helper/membuf.c
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "membuf.h"