Fixes from Oleksandr Tymoshenko "gonzo@bluezbox.com"

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

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) {

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"