From cb9a2ff1daf017a3aee23c70c5210608e19df681 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 22 4月 2015 02:37:15 +0800
Subject: [PATCH] Add more compile checks and resolve warnings

---
 libscpi/test/test_scpi_utils.c |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libscpi/test/test_scpi_utils.c b/libscpi/test/test_scpi_utils.c
index e357b65..4d1f634 100644
--- a/libscpi/test/test_scpi_utils.c
+++ b/libscpi/test/test_scpi_utils.c
@@ -46,15 +46,15 @@
  * CUnit Test Suite
  */
 
-int init_suite(void) {
+static int init_suite(void) {
     return 0;
 }
 
-int clean_suite(void) {
+static int clean_suite(void) {
     return 0;
 }
 
-void test_strnpbrk() {
+static void test_strnpbrk() {
     char str[] = "ahoj";
 
     CU_ASSERT(strnpbrk(str, 4, "a") == (str + 0));
@@ -64,7 +64,7 @@
     CU_ASSERT(strnpbrk(str, 4, "xo") == (str + 2));
 }
 
-void test_longToStr() {
+static void test_longToStr() {
     char str[32];
     size_t len;
 
@@ -75,7 +75,7 @@
     CU_ASSERT(str[2] == '\0');
 }
 
-void test_doubleToStr() {
+static void test_doubleToStr() {
     size_t result;
     char str[50];
 
@@ -97,7 +97,7 @@
     TEST_DOUBLE_TO_STR(-1.3e-30, 8, "-1.3e-30");
 }
 
-void test_strToLong() {
+static void test_strToLong() {
     size_t result;
     int32_t val;
 
@@ -122,7 +122,7 @@
     TEST_STR_TO_LONG("018", 2, 1); // octal 1, 8 is ignored
 }
 
-void test_strToDouble() {
+static void test_strToDouble() {
     double val;
     size_t result;
 
@@ -155,7 +155,7 @@
 
 }
 
-void test_compareStr() {
+static void test_compareStr() {
 
     CU_ASSERT_TRUE(compareStr("abcd", 1, "afgh", 1));
     CU_ASSERT_TRUE(compareStr("ABCD", 4, "abcd", 4));
@@ -166,7 +166,7 @@
     CU_ASSERT_FALSE(compareStr("ABCD", 4, "abcd", 3));
 }
 
-void test_compareStrAndNum() {
+static void test_compareStrAndNum() {
 
     CU_ASSERT_TRUE(compareStrAndNum("abcd", 1, "afgh", 1));
     CU_ASSERT_TRUE(compareStrAndNum("ABCD", 4, "abcd", 4));
@@ -184,7 +184,7 @@
 
 }
 
-void test_locateText() {
+static void test_locateText() {
 
     const char * v;
     const char * b;
@@ -234,7 +234,7 @@
     TEST_LOCATE_TEXT(" \"a\" , a ", TRUE, 2, 1);
 }
 
-void test_locateStr() {
+static void test_locateStr() {
 
     const char * v;
     const char * b;
@@ -282,7 +282,7 @@
     TEST_LOCATE_STR(" \"a\" , a ", TRUE, 1, 3);
 }
 
-void test_matchPattern() {
+static void test_matchPattern() {
     scpi_bool_t result;
     
 #define TEST_MATCH_PATTERN(p, s, r)                             \
@@ -298,7 +298,7 @@
     TEST_MATCH_PATTERN("AB", "a", FALSE);
 }
 
-void test_matchCommand() {
+static void test_matchCommand() {
     scpi_bool_t result;
     
     #define TEST_MATCH_COMMAND(p, s, r)                         \
@@ -424,7 +424,7 @@
     TEST_MATCH_COMMAND("OUTPut#[:MODulation#]:FM#", "output:fm", TRUE); // test numeric parameter
 }
 
-void test_composeCompoundCommand(void) {
+static void test_composeCompoundCommand(void) {
     
 #define TEST_COMPOSE_COMMAND(b, c1_len, c2_pos, c2_len, c2_final, r)    \
     {                                                                   \

--
Gitblit v1.9.1