From 7cda47a529a298886d739d6a0c1a8114e6e0c6ad Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 27 8月 2015 23:32:00 +0800
Subject: [PATCH] Remove pkg-config from cunit test build

---
 examples/common/scpi-def.c |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index aa3866d..4e690b8 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -46,12 +46,12 @@
     fprintf(stderr, "meas:volt:dc\r\n"); // debug command name   
 
     // read first parameter if present
-    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param1, false)) {
+    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param1, FALSE)) {
         // do something, if parameter not present
     }
 
     // read second paraeter if present
-    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param2, false)) {
+    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param2, FALSE)) {
         // do something, if parameter not present
     }
 
@@ -75,12 +75,12 @@
     fprintf(stderr, "meas:volt:ac\r\n"); // debug command name   
 
     // read first parameter if present
-    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param1, false)) {
+    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param1, FALSE)) {
         // do something, if parameter not present
     }
 
     // read second paraeter if present
-    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param2, false)) {
+    if (!SCPI_ParamNumber(context, scpi_special_numbers_def, &param2, FALSE)) {
         // do something, if parameter not present
     }
 
@@ -102,12 +102,12 @@
     fprintf(stderr, "conf:volt:dc\r\n"); // debug command name   
 
     // read first parameter if present
-    if (!SCPI_ParamDouble(context, &param1, true)) {
+    if (!SCPI_ParamDouble(context, &param1, TRUE)) {
         return SCPI_RES_ERR;
     }
 
     // read second paraeter if present
-    if (!SCPI_ParamDouble(context, &param2, false)) {
+    if (!SCPI_ParamDouble(context, &param2, FALSE)) {
         // do something, if parameter not present
     }
 
@@ -122,7 +122,7 @@
     fprintf(stderr, "TEST:BOOL\r\n"); // debug command name   
 
     // read first parameter if present
-    if (!SCPI_ParamBool(context, &param1, true)) {
+    if (!SCPI_ParamBool(context, &param1, TRUE)) {
         return SCPI_RES_ERR;
     }
 
@@ -144,7 +144,7 @@
     int32_t param;
     const char * name;
     
-    if (!SCPI_ParamChoice(context, trigger_source, &param, true)) {
+    if (!SCPI_ParamChoice(context, trigger_source, &param, TRUE)) {
         return SCPI_RES_ERR;
     }
     
@@ -157,8 +157,11 @@
 }
 
 static scpi_result_t TEST_Numbers(scpi_t * context) {
+    int32_t numbers[2];
 
-    fprintf(stderr, "RAW CMD %.*s\r\n", (int)context->param_list.cmd_raw.length, context->param_list.cmd_raw.data);
+    SCPI_CommandNumbers(context, numbers, 2);
+
+    fprintf(stderr, "TEST numbers %d %d\r\n", numbers[0], numbers[1]);
 
     return SCPI_RES_OK;
 }
@@ -167,8 +170,8 @@
     char buffer[100];
     size_t copy_len;
 
-    buffer[0] = 0;
-    SCPI_ParamCopyText(context, buffer, 100, &copy_len, false);
+    SCPI_ParamCopyText(context, buffer, sizeof(buffer), &copy_len, FALSE);
+    buffer[copy_len] = '\0';
 
     fprintf(stderr, "TEXT: ***%s***\r\n", buffer);
 
@@ -179,7 +182,7 @@
     const char * data;
     size_t len;
 
-    SCPI_ParamArbitraryBlock(context, &data, &len, false);
+    SCPI_ParamArbitraryBlock(context, &data, &len, FALSE);
 
     SCPI_ResultArbitraryBlock(context, data, len);
 

--
Gitblit v1.9.1