From 736d46e8b3df141a8178c2e57e330a04ff775a35 Mon Sep 17 00:00:00 2001
From: Arrigo Marchiori <ardovm@yahoo.it>
Date: 周五, 14 10月 2016 23:20:50 +0800
Subject: [PATCH] remove a "unused parameter" warning
---
libscpi/test/test_parser.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index 61fda2d..8aaf6d7 100644
--- a/libscpi/test/test_parser.c
+++ b/libscpi/test/test_parser.c
@@ -350,7 +350,7 @@
}
#define TEST_IEEE4882_REG(reg, expected) { \
- CU_ASSERT_EQUAL(SCPI_RegGet(&scpi_context, reg), expected); \
+ CU_ASSERT_EQUAL(SCPI_RegGet(&scpi_context, (scpi_reg_name_t)(reg)), expected);\
}
@@ -516,7 +516,7 @@
TEST_ParamUInt32("#H101010", TRUE, 1052688, TRUE, 0);
TEST_ParamUInt32("#Q10", TRUE, 8, TRUE, 0);
- TEST_ParamUInt32("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); /* missing parameter *
+ TEST_ParamUInt32("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); /* missing parameter */
TEST_ParamUInt32("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); /* Data type error */
TEST_ParamUInt32("10.5V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
TEST_ParamUInt32("10V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
@@ -1203,8 +1203,10 @@
TEST_Result(Double, 2147483647, "2147483647");
/* TEST_Result(Double, -2147483648, "-2147483648"); bug in GCC */
TEST_Result(Double, -2147483647, "-2147483647");
- TEST_Result(Double, 9223372036854775807LL, "9.22337203685478e+18");
- TEST_Result(Double, -9223372036854775807LL, "-9.22337203685478e+18");
+ /* TEST_Result(Double, 9223372036854775807LL, "9.22337203685478e+18"); */
+ /* TEST_Result(Double, -9223372036854775807LL, "-9.22337203685478e+18"); */
+ TEST_Result(Double, 9223372036854700000LL, "9.2233720368547e+18");
+ TEST_Result(Double, -9223372036854700000LL, "-9.2233720368547e+18");
TEST_Result(Double, 1.256e-17, "1.256e-17");
TEST_Result(Double, -1.256e-17, "-1.256e-17");
@@ -1435,7 +1437,7 @@
memset(buffer, 0xaa, 100);\
size_t res_len;\
res_len = SCPI_NumberToStr(&scpi_context, scpi_special_numbers_def, &number, buffer, limit);\
- size_t expected_len = strnlen(expected_result, limit - 1);\
+ size_t expected_len = SCPIDEFINE_strnlen(expected_result, limit - 1);\
CU_ASSERT_NSTRING_EQUAL(buffer, expected_result, expected_len);\
CU_ASSERT_EQUAL(buffer[expected_len], 0);\
CU_ASSERT_EQUAL((unsigned char)buffer[limit], 0xaa);\
--
Gitblit v1.9.1