From fdce1ea4431cfc32b7015dd1fe1b71b548d26023 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 24 4月 2016 21:30:36 +0800
Subject: [PATCH] Move free from SCPI_ResultError to SCPI_SystemErrorNextQ to correspond with SCPI_ErrorPop
---
libscpi/inc/scpi/parser.h | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/libscpi/inc/scpi/parser.h b/libscpi/inc/scpi/parser.h
index f89310a..2f00c82 100644
--- a/libscpi/inc/scpi/parser.h
+++ b/libscpi/inc/scpi/parser.h
@@ -49,8 +49,10 @@
const scpi_unit_def_t * units,
const char * idn1, const char * idn2, const char * idn3, const char * idn4,
char * input_buffer, size_t input_buffer_length,
- scpi_error_t * error_queue_data, int16_t error_queue_size,
- char * error_info_heap, size_t error_info_heap_length);
+ scpi_error_t * error_queue_data, int16_t error_queue_size);
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION && !USE_MEMORY_ALLOCATION_FREE
+ void SCPI_InitHeap(scpi_t * context, char * error_info_heap, size_t error_info_heap_length);
+#endif
scpi_bool_t SCPI_Input(scpi_t * context, const char * data, int len);
scpi_bool_t SCPI_Parse(scpi_t * context, char * data, int len);
@@ -72,6 +74,7 @@
size_t SCPI_ResultFloat(scpi_t * context, float val);
size_t SCPI_ResultDouble(scpi_t * context, double val);
size_t SCPI_ResultText(scpi_t * context, const char * data);
+ size_t SCPI_ResultError(scpi_t * context, scpi_error_t * error);
size_t SCPI_ResultArbitraryBlock(scpi_t * context, const void * data, size_t len);
size_t SCPI_ResultArbitraryBlockHeader(scpi_t * context, size_t len);
size_t SCPI_ResultArbitraryBlockData(scpi_t * context, const void * data, size_t len);
--
Gitblit v1.9.1