From 5ce645be3c85d3cca69ac3d3fde5a4059c6d7891 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 06 8月 2015 17:42:15 +0800
Subject: [PATCH] Fix type cast warnings in LabWindows/CVI

---
 libscpi/src/lexer.c   |    4 ++--
 libscpi/src/ieee488.c |    4 ++--
 libscpi/src/minimal.c |    2 +-
 libscpi/src/parser.c  |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c
index e91d62a..0593d23 100644
--- a/libscpi/src/ieee488.c
+++ b/libscpi/src/ieee488.c
@@ -212,7 +212,7 @@
 scpi_result_t SCPI_CoreEse(scpi_t * context) {
     int32_t new_ESE;
     if (SCPI_ParamInt(context, &new_ESE, TRUE)) {
-        SCPI_RegSet(context, SCPI_REG_ESE, new_ESE);
+        SCPI_RegSet(context, SCPI_REG_ESE, (scpi_reg_val_t)new_ESE);
     }
     return SCPI_RES_OK;
 }
@@ -302,7 +302,7 @@
 scpi_result_t SCPI_CoreSre(scpi_t * context) {
     int32_t new_SRE;
     if (SCPI_ParamInt(context, &new_SRE, TRUE)) {
-        SCPI_RegSet(context, SCPI_REG_SRE, new_SRE);
+        SCPI_RegSet(context, SCPI_REG_SRE, (scpi_reg_val_t)new_SRE);
     }
     return SCPI_RES_OK;
 }
diff --git a/libscpi/src/lexer.c b/libscpi/src/lexer.c
index 194205b..45b19ce 100644
--- a/libscpi/src/lexer.c
+++ b/libscpi/src/lexer.c
@@ -245,7 +245,7 @@
  * @param chr
  * @return 
  */
-static int skipChr(lex_state_t * state, int chr) {
+static int skipChr(lex_state_t * state, char chr) {
     if (!iseos(state) && ischr(state, chr)) {
         state->pos++;
         return SKIP_OK;
@@ -630,7 +630,7 @@
     return (c >= 0) && (c <= 0x7f);
 }
 
-static void skipQuoteProgramData(lex_state_t * state, int quote) {
+static void skipQuoteProgramData(lex_state_t * state, char quote) {
     while (!iseos(state)) {
         if (isascii7bit(state->pos[0]) && !ischr(state, quote)) {
             state->pos++;
diff --git a/libscpi/src/minimal.c b/libscpi/src/minimal.c
index 6727008..dd18ba1 100644
--- a/libscpi/src/minimal.c
+++ b/libscpi/src/minimal.c
@@ -131,7 +131,7 @@
 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);
+        SCPI_RegSet(context, SCPI_REG_QUESE, (scpi_reg_val_t)new_QUESE);
     }
     return SCPI_RES_OK;
 }
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index ef779bc..dfe84d7 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -414,7 +414,7 @@
     SCPI_LongToStr(len, block_header + 2, 10, 10);
 
     header_len = strlen(block_header + 2);
-    block_header[1] = header_len + '0';
+    block_header[1] = (char)(header_len + '0');
 
     result += writeData(context, block_header, header_len + 2);
     result += writeData(context, data, len);

--
Gitblit v1.9.1