From 508dece619e26b08a95fa856581d14816b2eef1f Mon Sep 17 00:00:00 2001
From: Chernov Dmitriy <cd_work@mail.ru>
Date: 周一, 29 2月 2016 22:16:38 +0800
Subject: [PATCH] manual heap ready
---
libscpi/src/error.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index ca48cc5..7b17f4c 100644
--- a/libscpi/src/error.c
+++ b/libscpi/src/error.c
@@ -84,7 +84,7 @@
#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
scpi_error_t error;
while(fifo_remove(&context->error_queue, &error)){
- SCPIDEFINE_free(&context->error_info_heap, error.device_dependent_info);
+ SCPIDEFINE_free(&context->error_info_heap, error.device_dependent_info, false);
}
#endif
fifo_clear(&context->error_queue);
@@ -138,9 +138,7 @@
static scpi_bool_t SCPI_ErrorAddInternal(scpi_t * context, int16_t err, char * info) {
if (!fifo_add(&context->error_queue, err, info)) {
- scpi_error_t * error;
- fifo_remove_last(&context->error_queue, error);
- SCPIDEFINE_free(&context->error_info_heap, error->device_dependent_info);
+ fifo_remove_last(&context->error_queue, NULL);
fifo_add(&context->error_queue, SCPI_ERROR_QUEUE_OVERFLOW, NULL);
return FALSE;
}
@@ -193,6 +191,7 @@
SCPI_ErrorEmit(context, err);
if (queue_overflow) {
SCPI_ErrorEmit(context, SCPI_ERROR_QUEUE_OVERFLOW);
+ SCPIDEFINE_free(&context->error_info_heap, info_ptr, true);
}
if (context) {
--
Gitblit v1.9.1