From 24006db953ebc5e672e8b4d14db1d3102670c237 Mon Sep 17 00:00:00 2001
From: Iztok Jeras <iztok.jeras@gmail.com>
Date: 周四, 08 10月 2015 03:02:03 +0800
Subject: [PATCH] integer parser: remove trailing spaces

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

diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index c17bb18..205bea6 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,11 +241,22 @@
  * @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);
 }
 
 /**
- * Converts double value to string
+ * Converts float (32 bit) value to string
+ * @param val   long value
+ * @param str   converted textual representation
+ * @param len   string buffer length
+ * @return number of bytes written to str (without '\0')
+ */
+size_t SCPI_FloatToStr(float val, char * str, size_t len) {
+    return SCPIDEFINE_floatToStr(val, str, len);
+}
+
+/**
+ * Converts double (64 bit) value to string
  * @param val   double value
  * @param str   converted textual representation
  * @param len   string buffer length
@@ -261,7 +272,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,15 +284,50 @@
  * @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 double representation
+ * 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;
+}
+
+/**
+ * Converts string to float (32 bit) representation
+ * @param str   string value
+ * @param val   float result
+ * @return      number of bytes used in string
+ */
+size_t strToFloat(const char * str, float * val) {
+    char * endptr;
+    *val = strtof(str, &endptr);
+    return endptr - str;
+}
+
+/**
+ * Converts string to double (64 bit) representation
  * @param str   string value
  * @param val   double result
  * @return      number of bytes used in string
@@ -336,7 +382,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