From e75066cc9261c65e835c7caf2e7bc89c7f468bfa Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 27 8月 2015 23:23:35 +0800
Subject: [PATCH] Try to fix travis build

---
 libscpi/src/utils.c |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 26e4973..66dbc64 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -156,6 +156,19 @@
 }
 
 /**
+ * Converts string to unsigned 32bit integer representation
+ * @param str   string value
+ * @param val   32bit integer result
+ * @return      number of bytes used in string
+ */
+size_t strToULong(const char * str, uint32_t * val, int8_t base) {
+    char * endptr;
+    *val = strtoul(str, &endptr, base);
+    return endptr - str;
+}
+
+
+/**
  * Converts string to double representation
  * @param str   string value
  * @param val   double result
@@ -254,7 +267,7 @@
  * @param len - max search length
  * @return position of separator or len
  */
-size_t patternSeparatorShortPos(const char * pattern, size_t len) {
+static size_t patternSeparatorShortPos(const char * pattern, size_t len) {
     size_t i;
     for (i = 0; (i < len) && pattern[i]; i++) {
         if (islower((unsigned char) pattern[i])) {
@@ -270,7 +283,7 @@
  * @param len - max search length
  * @return position of separator or len
  */
-size_t patternSeparatorPos(const char * pattern, size_t len) {
+static size_t patternSeparatorPos(const char * pattern, size_t len) {
 
     char * separator = strnpbrk(pattern, len, "?:[]");
     if (separator == NULL) {
@@ -286,7 +299,7 @@
  * @param len - max search length
  * @return position of separator or len
  */
-size_t cmdSeparatorPos(const char * cmd, size_t len) {
+static size_t cmdSeparatorPos(const char * cmd, size_t len) {
     char * separator = strnpbrk(cmd, len, ":?");
     size_t result;
     if (separator == NULL) {
@@ -338,7 +351,7 @@
     int rightFlag = 0; // flag for ']' on right
     int cmd_sep_pos = 0;
 
-    int32_t numbers_idx = -1;         /* Lutz Hoerl, Thorlabs: changed type from size_t to int, size_t is positive only, int does not produce unsigne warnings */
+    size_t numbers_idx = 0;
     int32_t *number_ptr = NULL;
 
     const char * pattern_ptr = pattern;
@@ -379,13 +392,13 @@
         }
 
         if (pattern_ptr[pattern_sep_pos - 1] == '#') {
-            numbers_idx++;
             if (numbers && (numbers_idx < numbers_len)) {
                 number_ptr = numbers + numbers_idx;
                 *number_ptr = 1; // default value
             } else {
                 number_ptr = NULL;
             }
+            numbers_idx++;
         } else {
             number_ptr = NULL;
         }
@@ -548,7 +561,7 @@
         if (c1 != c2) {
             return c1 - c2;
         }
-        if (c1 == '\0') {        /* Lutz Hoerl, Thorlabs: think this (c1 = '\0') was really a bug */
+        if (c1 == '\0') {
             return 0;
         }
     }

--
Gitblit v1.9.1