From 5e68cb0db1499c7cda1e7448e8fc1ebdb3e9f322 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 05 10月 2015 21:47:23 +0800
Subject: [PATCH] Resolve #54: Detect not typed numbers in SCPI_CommandNumbers
---
libscpi/src/utils.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index e07d0f3..47295c4 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -221,7 +221,7 @@
if (num) {
if (len1 == len2) {
- *num = 1;
+ //*num = 1;
} else {
int32_t tmpNum;
i = len1 + strToLong(str2 + len1, &tmpNum, 10);
@@ -345,7 +345,7 @@
* @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
@@ -394,7 +394,7 @@
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;
}
--
Gitblit v1.9.1