From 8adda07ed14b560a43250f1cb967f93f04d1c5de Mon Sep 17 00:00:00 2001
From: duane <duane@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Thu, 25 Jun 2009 00:12:40 +0000
Subject: [PATCH] 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 | 1 +
src/helper/membuf.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/flash/at91sam3.c b/src/flash/at91sam3.c
index 449bcae78..70377ad88 100644
--- 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 4e25d81a0..160d0bd7a 100644
--- 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"
--
GitLab