From b9972c6b63937373ea9db39249b3f23985758425 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: added 64 bit Param* functions

---
 libscpi/src/utils.c |   88 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 79 insertions(+), 9 deletions(-)

diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 711782d..8856003 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -69,7 +69,7 @@
 }
 
 /**
- * Converts signed/unsigned 32 bit integer value to string
+ * Converts signed/unsigned 32 bit integer value to string in specific base
  * @param val   integer value
  * @param str   converted textual representation
  * @param len   string buffer length
@@ -77,7 +77,7 @@
  * @param sign  
  * @return number of bytes written to str (without '\0')
  */
-size_t SCPI_Int32ToStr(int32_t val, char * str, size_t len, int8_t base, scpi_bool_t sign) {
+size_t UInt32ToStrBaseSign(uint32_t val, char * str, size_t len, int8_t base, scpi_bool_t sign) {
     const char digits[] = "0123456789ABCDEF";
 
 #define ADD_CHAR(c) if (pos < len) str[pos++] = (c)
@@ -110,7 +110,7 @@
         }
 
         // add sign for numbers in base 10
-        if (sign && (val < 0) && (base == 10)) {
+        if (sign && ((int32_t) val < 0) && (base == 10)) {
             uval = -val;
             ADD_CHAR('-');
         }
@@ -134,7 +134,30 @@
 }
 
 /**
- * Converts signed/unsigned 64 bit integer value to string
+ * Converts signed 32 bit integer value to string
+ * @param val   integer value
+ * @param str   converted textual representation
+ * @param len   string buffer length
+ * @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);
+}
+
+/**
+ * Converts unsigned 32 bit integer value to string in specific base
+ * @param val   integer value
+ * @param str   converted textual representation
+ * @param len   string buffer length
+ * @param base  output base
+ * @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);
+}
+
+/**
+ * Converts signed/unsigned 64 bit integer value to string in specific base
  * @param val   integer value
  * @param str   converted textual representation
  * @param len   string buffer length
@@ -142,7 +165,7 @@
  * @param sign  
  * @return number of bytes written to str (without '\0')
  */
-size_t SCPI_Int64ToStr(int64_t val, char * str, size_t len, int8_t base, scpi_bool_t sign) {
+size_t UInt64ToStrBaseSign(uint64_t val, char * str, size_t len, int8_t base, scpi_bool_t sign) {
     const char digits[] = "0123456789ABCDEF";
 
 #define ADD_CHAR(c) if (pos < len) str[pos++] = (c)
@@ -175,7 +198,7 @@
         }
 
         // add sign for numbers in base 10
-        if (sign && (val < 0) && (base == 10)) {
+        if (sign && ((int64_t) val < 0) && (base == 10)) {
             uval = -val;
             ADD_CHAR('-');
         }
@@ -199,6 +222,29 @@
 }
 
 /**
+ * Converts signed 64 bit integer value to string
+ * @param val   integer value
+ * @param str   converted textual representation
+ * @param len   string buffer length
+ * @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);
+}
+
+/**
+ * Converts signed/unsigned 64 bit integer value to string in specific base
+ * @param val   integer value
+ * @param str   converted textual representation
+ * @param len   string buffer length
+ * @param base  output base
+ * @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);
+}
+
+/**
  * Converts double value to string
  * @param val   double value
  * @param str   converted textual representation
@@ -215,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;
@@ -227,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;
 }
 
@@ -290,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