From 9ed3ff990b0d69a6bed4eb26c82aad8b232e850a Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 26 11月 2015 03:34:54 +0800
Subject: [PATCH] Remove default IDN result

---
 examples/test-interactive/main.c |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/examples/test-interactive/main.c b/examples/test-interactive/main.c
index ba284e7..ad79036 100644
--- a/examples/test-interactive/main.c
+++ b/examples/test-interactive/main.c
@@ -45,18 +45,21 @@
     return fwrite(data, 1, len, stdout);
 }
 
-scpi_result_t SCPI_Flush(scpi_t * context) {    
+scpi_result_t SCPI_Flush(scpi_t * context) {
+    (void) context;
     return SCPI_RES_OK;
 }
 
 int SCPI_Error(scpi_t * context, int_fast16_t err) {
     (void) context;
 
-    fprintf(stderr, "**ERROR: %d, \"%s\"\r\n", (int32_t) err, SCPI_ErrorTranslate(err));
+    fprintf(stderr, "**ERROR: %d, \"%s\"\r\n", (int16_t) err, SCPI_ErrorTranslate(err));
     return 0;
 }
 
 scpi_result_t SCPI_Control(scpi_t * context, scpi_ctrl_name_t ctrl, scpi_reg_val_t val) {
+    (void) context;
+
     if (SCPI_CTRL_SRQ == ctrl) {
         fprintf(stderr, "**SRQ: 0x%X (%d)\r\n", val, val);
     } else {
@@ -65,26 +68,19 @@
     return SCPI_RES_OK;
 }
 
-/**
- * Callback for *TST? command
- * 
- * It returns directly the result of the test
- * @param context
- * @return 0 means "test was OK", other values means, that some error bits are set
- */
-int32_t SCPI_Test(scpi_t * context) {
-    fprintf(stderr, "**Test\r\n");
-    return 0;
-}
-
 scpi_result_t SCPI_Reset(scpi_t * context) {
+    (void) context;
+
     fprintf(stderr, "**Reset\r\n");
     return SCPI_RES_OK;
 }
 
 scpi_result_t SCPI_SystemCommTcpipControlQ(scpi_t * context) {
+    (void) context;
+
     return SCPI_RES_ERR;
 }
+
 /*
  * 
  */
@@ -99,8 +95,10 @@
     printf("SCPI Interactive demo\r\n");
     char smbuffer[10];
     while (1) {
-         fgets(smbuffer, 10, stdin);
-         SCPI_Input(&scpi_context, smbuffer, strlen(smbuffer));
+        if (NULL == fgets(smbuffer, 10, stdin)) {
+            break;
+        }
+        SCPI_Input(&scpi_context, smbuffer, strlen(smbuffer));
     }
 
 

--
Gitblit v1.9.1