From 219ca4fc80ef6491555b403c6884566c8e1deefd Mon Sep 17 00:00:00 2001
From: Rich Barlow <rich@bennellick.com>
Date: 周一, 10 4月 2017 18:38:40 +0800
Subject: [PATCH] Don't reference malloc if not using alloc/free
---
libscpi/inc/scpi/error.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libscpi/inc/scpi/error.h b/libscpi/inc/scpi/error.h
index 36c8986..4a762b4 100644
--- a/libscpi/inc/scpi/error.h
+++ b/libscpi/inc/scpi/error.h
@@ -46,9 +46,8 @@
void SCPI_ErrorInit(scpi_t * context, scpi_error_t * data, int16_t size);
void SCPI_ErrorClear(scpi_t * context);
- scpi_bool_t SCPI_ErrorPopEx(scpi_t * context, scpi_error_t * error);
- int16_t SCPI_ErrorPop(scpi_t * context);
- void SCPI_ErrorPushEx(scpi_t * context, int16_t err, char * info);
+ scpi_bool_t SCPI_ErrorPop(scpi_t * context, scpi_error_t * error);
+ void SCPI_ErrorPushEx(scpi_t * context, int16_t err, char * info, size_t info_len);
void SCPI_ErrorPush(scpi_t * context, int16_t err);
int32_t SCPI_ErrorCount(scpi_t * context);
const char * SCPI_ErrorTranslate(int16_t err);
@@ -61,6 +60,7 @@
* XE macro is for full set of SCPI errors available to user application
*/
#define LIST_OF_ERRORS \
+ X(SCPI_ERROR_NO_ERROR, 0, "No error") \
XE(SCPI_ERROR_COMMAND, -100, "Command error") \
X(SCPI_ERROR_INVALID_CHARACTER, -101, "Invalid character") \
XE(SCPI_ERROR_SYNTAX, -102, "Syntax error") \
--
Gitblit v1.9.1