From cf33d5a972d12bdf3043a7de8dd337051b2d21b0 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: fixed some integer castings
---
libscpi/src/utils.c | 184 +++++++++++++++++----------------------------
1 files changed, 71 insertions(+), 113 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 72c13e9..8856003 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -69,14 +69,15 @@
}
/**
- * Converts signed 32b 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
* @param base output base
+ * @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) {
+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)
@@ -99,7 +100,7 @@
case 10:
x = 1000000000L;
break;
- case 0x10:
+ case 16:
x = 0x10000000L;
break;
default:
@@ -109,7 +110,7 @@
}
// add sign for numbers in base 10
- if ((val < 0) && (base == 10)) {
+ if (sign && ((int32_t) val < 0) && (base == 10)) {
uval = -val;
ADD_CHAR('-');
}
@@ -133,71 +134,38 @@
}
/**
- * Converts unsigned 32b 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
- * @param base output base
* @return number of bytes written to str (without '\0')
*/
-size_t SCPI_UInt32ToStr(uint32_t val, char * str, size_t len, int8_t base) {
- const char digits[] = "0123456789ABCDEF";
-
-#define ADD_CHAR(c) if (pos < len) str[pos++] = (c)
- uint32_t x = 0;
- int_fast8_t digit;
- size_t pos = 0;
-
- if (val == 0) {
- ADD_CHAR('0');
- } else {
-
- switch (base) {
- case 2:
- x = 0x80000000L;
- break;
- case 8:
- x = 0x40000000L;
- break;
- case 10:
- x = 1000000000L;
- break;
- case 0x10:
- x = 0x10000000L;
- break;
- default:
- x = 1000000000L;
- base = 10;
- break;
- }
-
- // remove leading zeros
- while ((val / x) == 0) {
- x /= base;
- }
-
- do {
- digit = (uint8_t) (val / x);
- ADD_CHAR(digits[digit]);
- val -= digit * x;
- x /= base;
- } while (x && (pos < len));
- }
-
- if (pos < len) str[pos] = 0;
- return pos;
-#undef ADD_CHAR
+size_t SCPI_Int32ToStr(int32_t val, char * str, size_t len) {
+ UInt32ToStrBaseSign((int32_t) val, str, len, 10, TRUE);
}
/**
- * Converts signed 64b integer value to string
+ * 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_Int64ToStr(int64_t val, char * str, size_t len, int8_t base) {
+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
+ * @param base output base
+ * @param sign
+ * @return number of bytes written to str (without '\0')
+ */
+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)
@@ -212,25 +180,25 @@
switch (base) {
case 2:
- x = 0x8000000000000000LL;
+ x = 0x8000000000000000ULL;
break;
case 8:
- x = 0x8000000000000000LL;
+ x = 0x8000000000000000ULL;
break;
case 10:
- x = 1000000000000000000LL;
+ x = 10000000000000000000ULL;
break;
- case 0x10:
- x = 0x1000000000000000LL;
+ case 16:
+ x = 0x1000000000000000ULL;
break;
default:
- x = 1000000000000000000LL;
+ x = 10000000000000000000ULL;
base = 10;
break;
}
// add sign for numbers in base 10
- if ((val < 0) && (base == 10)) {
+ if (sign && ((int64_t) val < 0) && (base == 10)) {
uval = -val;
ADD_CHAR('-');
}
@@ -254,60 +222,26 @@
}
/**
- * Converts unsigned 64b integer value to string
+ * 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_UInt64ToStr(uint64_t val, char * str, size_t len, int8_t base) {
- const char digits[] = "0123456789ABCDEF";
-
-#define ADD_CHAR(c) if (pos < len) str[pos++] = (c)
- uint64_t x = 0;
- int_fast8_t digit;
- size_t pos = 0;
-
- if (val == 0) {
- ADD_CHAR('0');
- } else {
-
- switch (base) {
- case 2:
- x = 0x8000000000000000ULL;
- break;
- case 8:
- x = 0x8000000000000000ULL;
- break;
- case 10:
- x = 10000000000000000000ULL;
- break;
- case 0x10:
- x = 0x1000000000000000ULL;
- break;
- default:
- x = 10000000000000000000ULL;
- base = 10;
- break;
- }
-
- // remove leading zeros
- while ((val / x) == 0) {
- x /= base;
- }
-
- do {
- digit = (uint8_t) (val / x);
- ADD_CHAR(digits[digit]);
- val -= digit * x;
- x /= base;
- } while (x && (pos < len));
- }
-
- if (pos < len) str[pos] = 0;
- return pos;
-#undef ADD_CHAR
+size_t SCPI_UInt64ToStrBase(uint64_t val, char * str, size_t len, int8_t base) {
+ UInt64ToStrBaseSign(val, str, len, base, FALSE);
}
/**
@@ -327,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;
@@ -339,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;
}
@@ -402,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