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/parser.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index ca711eb..c9d63f4 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -153,7 +153,7 @@
for (i = 0; context->cmdlist[i].pattern != NULL; i++) {
cmd = &context->cmdlist[i];
- if (matchCommand(cmd->pattern, header, len, NULL, 0)) {
+ if (matchCommand(cmd->pattern, header, len, NULL, 0, 0)) {
context->param_list.cmd = cmd;
return TRUE;
}
@@ -1073,7 +1073,7 @@
}
pattern = context->param_list.cmd->pattern;
- return matchCommand (pattern, cmd, strlen (cmd), NULL, 0);
+ return matchCommand (pattern, cmd, strlen (cmd), NULL, 0, 0);
}
/**
@@ -1090,11 +1090,11 @@
}
scpi_bool_t SCPI_Match(const char * pattern, const char * value, size_t len) {
- return matchCommand (pattern, value, len, NULL, 0);
+ return matchCommand (pattern, value, len, NULL, 0, 0);
}
-scpi_bool_t SCPI_CommandNumbers(scpi_t * context, int32_t * numbers, size_t len) {
- return matchCommand (context->param_list.cmd->pattern, context->param_list.cmd_raw.data, context->param_list.cmd_raw.length, numbers, len);
+scpi_bool_t SCPI_CommandNumbers(scpi_t * context, int32_t * numbers, size_t len, int32_t default_value) {
+ return matchCommand (context->param_list.cmd->pattern, context->param_list.cmd_raw.data, context->param_list.cmd_raw.length, numbers, len, default_value);
}
/**
--
Gitblit v1.9.1