From 01b185f9795340e28b53f46a4bd8af7de6299c47 Mon Sep 17 00:00:00 2001
From: Iztok Jeras <iztok.jeras@redpitaya.com>
Date: 周四, 08 10月 2015 03:00:34 +0800
Subject: [PATCH] integer parser: fix array length for double variables

---
 libscpi/src/utils.c |   38 +++++++++++++++++++++++++++++++-------
 1 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index c17bb18..456e8f3 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -141,7 +141,7 @@
  * @return number of bytes written to str (without '\0')
  */
 size_t SCPI_Int32ToStr(int32_t val, char * str, size_t len) {
-    UInt32ToStrBaseSign((int32_t) val, str, len, 10, TRUE);
+    return UInt32ToStrBaseSign((int32_t) val, str, len, 10, TRUE);
 }
 
 /**
@@ -153,7 +153,7 @@
  * @return number of bytes written to str (without '\0')
  */
 size_t SCPI_UInt32ToStrBase(uint32_t val, char * str, size_t len, int8_t base) {
-    UInt32ToStrBaseSign(val, str, len, base, FALSE);
+    return UInt32ToStrBaseSign(val, str, len, base, FALSE);
 }
 
 /**
@@ -229,7 +229,7 @@
  * @return number of bytes written to str (without '\0')
  */
 size_t SCPI_Int64ToStr(int64_t val, char * str, size_t len) {
-    UInt64ToStrBaseSign((int64_t) val, str, len, 10, TRUE);
+    return UInt64ToStrBaseSign((int64_t) val, str, len, 10, TRUE);
 }
 
 /**
@@ -241,7 +241,7 @@
  * @return number of bytes written to str (without '\0')
  */
 size_t SCPI_UInt64ToStrBase(uint64_t val, char * str, size_t len, int8_t base) {
-    UInt64ToStrBaseSign(val, str, len, base, FALSE);
+    return UInt64ToStrBaseSign(val, str, len, base, FALSE);
 }
 
 /**
@@ -261,7 +261,7 @@
  * @param val   32bit integer result
  * @return      number of bytes used in string
  */
-size_t strToInt32(const char * str, int32_t * val, int8_t base) {
+size_t strBaseToInt32(const char * str, int32_t * val, int8_t base) {
     char * endptr;
     *val = strtol(str, &endptr, base);
     return endptr - str;
@@ -273,9 +273,33 @@
  * @param val   32bit integer result
  * @return      number of bytes used in string
  */
-size_t strToUInt32(const char * str, uint32_t * val, int8_t base) {
+size_t strBaseToUInt32(const char * str, uint32_t * val, int8_t base) {
     char * endptr;
     *val = strtoul(str, &endptr, base);
+    return endptr - str;
+}
+
+/**
+ * Converts string to signed 64bit integer representation
+ * @param str   string value
+ * @param val   64bit integer result
+ * @return      number of bytes used in string
+ */
+size_t strBaseToInt64(const char * str, int64_t * val, int8_t base) {
+    char * endptr;
+    *val = strtol(str, &endptr, base);
+    return endptr - str;
+}
+
+/**
+ * Converts string to unsigned 64bit integer representation
+ * @param str   string value
+ * @param val   64bit integer result
+ * @return      number of bytes used in string
+ */
+size_t strBaseToUInt64(const char * str, uint64_t * val, int8_t base) {
+    char * endptr;
+    *val = strtoull(str, &endptr, base);
     return endptr - str;
 }
 
@@ -336,7 +360,7 @@
                 //*num = 1;
             } else {
                 int32_t tmpNum;
-                i = len1 + strToInt32(str2 + len1, &tmpNum, 10);
+                i = len1 + strBaseToInt32(str2 + len1, &tmpNum, 10);
                 if (i != len2) {
                     result = FALSE;
                 } else {

--
Gitblit v1.9.1