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 | 217 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 187 insertions(+), 30 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 26e4973..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_LongToStr(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,6 +134,117 @@
}
/**
+ * 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
+ * @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)
+ uint64_t x = 0;
+ int_fast8_t digit;
+ size_t pos = 0;
+ uint64_t uval = val;
+
+ if (uval == 0) {
+ ADD_CHAR('0');
+ } else {
+
+ switch (base) {
+ case 2:
+ x = 0x8000000000000000ULL;
+ break;
+ case 8:
+ x = 0x8000000000000000ULL;
+ break;
+ case 10:
+ x = 10000000000000000000ULL;
+ break;
+ case 16:
+ x = 0x1000000000000000ULL;
+ break;
+ default:
+ x = 10000000000000000000ULL;
+ base = 10;
+ break;
+ }
+
+ // add sign for numbers in base 10
+ if (sign && ((int64_t) val < 0) && (base == 10)) {
+ uval = -val;
+ ADD_CHAR('-');
+ }
+
+ // remove leading zeros
+ while ((uval / x) == 0) {
+ x /= base;
+ }
+
+ do {
+ digit = (uint8_t) (uval / x);
+ ADD_CHAR(digits[digit]);
+ uval -= digit * x;
+ x /= base;
+ } while (x && (pos < len));
+ }
+
+ if (pos < len) str[pos] = 0;
+ return pos;
+#undef ADD_CHAR
+}
+
+/**
+ * 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
@@ -149,11 +261,48 @@
* @param val 32bit integer result
* @return number of bytes used in string
*/
-size_t strToLong(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;
}
+
+/**
+ * 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 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;
+}
+
/**
* Converts string to double representation
@@ -208,10 +357,10 @@
if (num) {
if (len1 == len2) {
- *num = 1;
+ //*num = 1;
} else {
int32_t tmpNum;
- i = len1 + strToLong(str2 + len1, &tmpNum, 10);
+ i = len1 + strBaseToInt32(str2 + len1, &tmpNum, 10);
if (i != len2) {
result = FALSE;
} else {
@@ -254,7 +403,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 +419,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 +435,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) {
@@ -309,7 +458,7 @@
scpi_bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len, int32_t * num) {
int pattern_sep_pos_short;
- if (pattern[pattern_len - 1] == '#') {
+ if ((pattern_len > 0) && pattern[pattern_len - 1] == '#') {
size_t new_pattern_len = pattern_len - 1;
pattern_sep_pos_short = patternSeparatorShortPos(pattern, new_pattern_len);
@@ -332,13 +481,13 @@
* @param len - max search length
* @return TRUE if pattern matches, FALSE otherwise
*/
-scpi_bool_t matchCommand(const char * pattern, const char * cmd, size_t len, int32_t *numbers, size_t numbers_len) {
+scpi_bool_t matchCommand(const char * pattern, const char * cmd, size_t len, int32_t *numbers, size_t numbers_len, int32_t default_value) {
scpi_bool_t result = FALSE;
int leftFlag = 0; // flag for '[' on left
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;
@@ -378,20 +527,21 @@
cmd_sep_pos = cmdSeparatorPos(cmd_ptr, cmd_end - cmd_ptr);
}
- if (pattern_ptr[pattern_sep_pos - 1] == '#') {
- numbers_idx++;
+ if ((pattern_sep_pos > 0) && pattern_ptr[pattern_sep_pos - 1] == '#') {
if (numbers && (numbers_idx < numbers_len)) {
number_ptr = numbers + numbers_idx;
- *number_ptr = 1; // default value
+ *number_ptr = default_value; // default value
} else {
number_ptr = NULL;
}
+ numbers_idx++;
} else {
number_ptr = NULL;
}
if (matchPattern(pattern_ptr, pattern_sep_pos, cmd_ptr, cmd_sep_pos, number_ptr)) {
- pattern_ptr = pattern_ptr + pattern_sep_pos;
+ pattern_ptr += pattern_sep_pos;
+ pattern_len -= pattern_sep_pos;
cmd_ptr = cmd_ptr + cmd_sep_pos;
result = TRUE;
@@ -422,24 +572,28 @@
/* both command and patter contains command separator at this position */
if ((pattern_ptr[0] == cmd_ptr[0]) && ((pattern_ptr[0] == ':') || (pattern_ptr[0] == '?'))) {
- pattern_ptr = pattern_ptr + 1;
+ pattern_ptr += 1;
+ pattern_len -= 1;
cmd_ptr = cmd_ptr + 1;
- } else if ((pattern_ptr[1] == cmd_ptr[0])
+ } else if ((pattern_len > 1) && (pattern_ptr[1] == cmd_ptr[0])
&& (pattern_ptr[0] == '[')
&& (pattern_ptr[1] == ':')) {
- pattern_ptr = pattern_ptr + 2; // for skip '[' in "[:"
+ pattern_ptr += 2; // for skip '[' in "[:"
+ pattern_len -= 2;
cmd_ptr = cmd_ptr + 1;
leftFlag++;
- } else if ((pattern_ptr[1] == cmd_ptr[0])
+ } else if ((pattern_len > 1) && (pattern_ptr[1] == cmd_ptr[0])
&& (pattern_ptr[0] == ']')
&& (pattern_ptr[1] == ':')) {
- pattern_ptr = pattern_ptr + 2; // for skip ']' in "]:"
+ pattern_ptr += 2; // for skip ']' in "]:"
+ pattern_len -= 2;
cmd_ptr = cmd_ptr + 1;
- } else if ((pattern_ptr[2] == cmd_ptr[0])
+ } else if ((pattern_len > 2) && (pattern_ptr[2] == cmd_ptr[0])
&& (pattern_ptr[0] == ']')
&& (pattern_ptr[1] == '[')
&& (pattern_ptr[2] == ':')) {
- pattern_ptr = pattern_ptr + 3; // for skip '][' in "][:"
+ pattern_ptr += 3; // for skip '][' in "][:"
+ pattern_len -= 3;
cmd_ptr = cmd_ptr + 1;
leftFlag++;
} else if (((pattern_ptr[0] == ']')
@@ -453,14 +607,17 @@
break;
}
} else {
- pattern_ptr = pattern_ptr + pattern_sep_pos;
+ pattern_ptr += pattern_sep_pos;
+ pattern_len -= pattern_sep_pos;
if ((pattern_ptr[0] == ']') && (pattern_ptr[1] == ':')) {
- pattern_ptr = pattern_ptr + 2; // for skip ']' in "]:" , pattern_ptr continue, while cmd_ptr remain unchanged
+ pattern_ptr += 2; // for skip ']' in "]:" , pattern_ptr continue, while cmd_ptr remain unchanged
+ pattern_len -= 2;
rightFlag++;
- } else if ((pattern_ptr[0] == ']')
+ } else if ((pattern_len > 2) && (pattern_ptr[0] == ']')
&& (pattern_ptr[1] == '[')
&& (pattern_ptr[2] == ':')) {
- pattern_ptr = pattern_ptr + 3; // for skip ']' in "][:" , pattern_ptr continue, while cmd_ptr remain unchanged
+ pattern_ptr += 3; // for skip ']' in "][:" , pattern_ptr continue, while cmd_ptr remain unchanged
+ pattern_len -= 3;
rightFlag++;
} else {
result = FALSE;
@@ -473,7 +630,7 @@
}
/**
- * Compose command from previsou command anc current command
+ * Compose command from previous command anc current command
*
* @param prev pointer to previous command
* @param current pointer of current command
@@ -548,7 +705,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