From 5f6fa3a6961ac8366ac3aa9ec36ce5eb0ad33a05 Mon Sep 17 00:00:00 2001
From: Andre Haupt <andre.haupt@omicron.at>
Date: 周三, 11 11月 2015 22:45:25 +0800
Subject: [PATCH] Fix uninitialised variable in RESULT_ARRAY macro.

---
 libscpi/src/minimal.c |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/libscpi/src/minimal.c b/libscpi/src/minimal.c
index 353fbe0..7641311 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;
 }
 
@@ -79,7 +79,7 @@
 scpi_result_t SCPI_SystemErrorNextQ(scpi_t * context) {
     int16_t err = SCPI_ErrorPop(context);
 
-    SCPI_ResultInt(context, err);
+    SCPI_ResultInt32(context, err);
     SCPI_ResultText(context, SCPI_ErrorTranslate(err));
 
     return SCPI_RES_OK;
@@ -91,7 +91,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 +103,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 +118,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;
 }
@@ -129,11 +129,10 @@
  * @return 
  */
 scpi_result_t SCPI_StatusQuestionableEnable(scpi_t * context) {
-    scpi_parameter_t parameter;
-    if (SCPI_Parameter(context, &parameter, TRUE)) {
-        SCPI_RegSet(context, SCPI_REG_QUESE, SCPI_ParamGetIntVal(context, &parameter));
+    int32_t 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