From 3344d1a728d37f0fb3e82a6a945eee0c780eb734 Mon Sep 17 00:00:00 2001
From: Chernov Dmitriy <cd_work@mail.ru>
Date: 周三, 02 3月 2016 21:29:32 +0800
Subject: [PATCH] Fix potential memory leak. #73
---
libscpi/src/minimal.c | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/libscpi/src/minimal.c b/libscpi/src/minimal.c
index 304658a..8abd39d 100644
--- a/libscpi/src/minimal.c
+++ b/libscpi/src/minimal.c
@@ -57,7 +57,7 @@
* @return
*/
scpi_result_t SCPI_StubQ(scpi_t * context) {
- SCPI_ResultInt(context, 0);
+ SCPI_ResultInt32(context, 0);
return SCPI_RES_OK;
}
@@ -67,7 +67,7 @@
* @return
*/
scpi_result_t SCPI_SystemVersionQ(scpi_t * context) {
- SCPI_ResultText(context, SCPI_STD_VERSION_REVISION);
+ SCPI_ResultMnemonic(context, SCPI_STD_VERSION_REVISION);
return SCPI_RES_OK;
}
@@ -77,12 +77,10 @@
* @return
*/
scpi_result_t SCPI_SystemErrorNextQ(scpi_t * context) {
- int16_t err = SCPI_ErrorPop(context);
-
- SCPI_ResultInt(context, err);
- SCPI_ResultText(context, SCPI_ErrorTranslate(err));
-
- return SCPI_RES_OK;
+ scpi_error_t error;
+ SCPI_ErrorPop(context, &error);
+ SCPI_ResultError(context, &error);
+ return SCPI_RES_OK;
}
/**
@@ -91,7 +89,7 @@
* @return
*/
scpi_result_t SCPI_SystemErrorCountQ(scpi_t * context) {
- SCPI_ResultInt(context, SCPI_ErrorCount(context));
+ SCPI_ResultInt32(context, SCPI_ErrorCount(context));
return SCPI_RES_OK;
}
@@ -103,7 +101,7 @@
*/
scpi_result_t SCPI_StatusQuestionableEventQ(scpi_t * context) {
/* return value */
- SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_QUES));
+ SCPI_ResultInt32(context, SCPI_RegGet(context, SCPI_REG_QUES));
/* clear register */
SCPI_RegSet(context, SCPI_REG_QUES, 0);
@@ -118,7 +116,7 @@
*/
scpi_result_t SCPI_StatusQuestionableEnableQ(scpi_t * context) {
/* return value */
- SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_QUESE));
+ SCPI_ResultInt32(context, SCPI_RegGet(context, SCPI_REG_QUESE));
return SCPI_RES_OK;
}
@@ -130,8 +128,8 @@
*/
scpi_result_t SCPI_StatusQuestionableEnable(scpi_t * context) {
int32_t new_QUESE;
- if (SCPI_ParamInt(context, &new_QUESE, TRUE)) {
- SCPI_RegSet(context, SCPI_REG_QUESE, new_QUESE);
+ if (SCPI_ParamInt32(context, &new_QUESE, TRUE)) {
+ SCPI_RegSet(context, SCPI_REG_QUESE, (scpi_reg_val_t) new_QUESE);
}
return SCPI_RES_OK;
}
--
Gitblit v1.9.1