From cc47c934744c759fa47133fc70b7d23aa4a2d7f1 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周一, 21 4月 2025 19:55:59 +0800
Subject: [PATCH] 修改了一部分的宏定义声明和屏蔽了一些调试时的无效干扰
---
libscpi/src/parser.c | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 0e49a8f..ce17163 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -55,7 +55,8 @@
*/
static size_t writeData(scpi_t * context, const char * data, size_t len) {
if ((len > 0) && (data != NULL)) {
- return context->interface->write(context, data, len);
+ return 0;
+ // return context->interface->write(context, data, len);
} else {
return 0;
}
@@ -126,7 +127,9 @@
//璐熷懡浠ゅ洖璋冪殑鎵ц銆佸弬鏁板鐞嗗拰閿欒绠＄悊
static scpi_bool_t processCommand(scpi_t * context) {
+ //杩欎釜鍦版柟淇敼涓� 璇籧omdlist->pattern
const scpi_command_t * cmd = context->param_list.cmd;
+ //const scpi_command_t * cmd = context->cmdlist->pattern;
lex_state_t * state = &context->param_list.lex_state;
scpi_bool_t result = TRUE;
// 鍏堟娴嬫槸鍚︿负鏌ヨ鍛戒护(浠�?缁撳熬)
@@ -188,6 +191,7 @@
return TRUE;
}
}
+ context->SCPIerror = RETURN_NotFind;
return FALSE;
}
@@ -229,6 +233,7 @@
if (state->programHeader.type == SCPI_TOKEN_INVALID) {
SCPI_ErrorPush(context, SCPI_ERROR_INVALID_CHARACTER);
+ context->SCPIerror = RETURN_IllegalCommand;
result = FALSE;
}
else if (state->programHeader.len > 0)
@@ -254,6 +259,7 @@
size_t r2 = r;
while (r2 > 0 && (data[r2 - 1] == '\r' || data[r2 - 1] == '\n')) r2--;
SCPI_ErrorPushEx(context, SCPI_ERROR_UNDEFINED_HEADER, data, r2);
+ context->SCPIerror = RETURN_UnDefine;
result = FALSE;
}
}
@@ -372,7 +378,8 @@
context->buffer.position = 0;
context->buffer.data[context->buffer.position] = 0;
SCPI_ErrorPush(context, SCPI_ERROR_INPUT_BUFFER_OVERRUN);
- return FALSE;
+ context->SCPIerror = RETURN_LengthOverFlow;
+ return result;
}
memcpy(&context->buffer.data[context->buffer.position], data, len);
context->buffer.position += len;
@@ -1051,6 +1058,9 @@
return result;
}
+
+
+
/**
* Read signed/unsigned 32 bit integer parameter
* @param context
@@ -1480,8 +1490,8 @@
*/
//璇嗗埆瀹屾暣鐨凷CPI鍛戒护
int scpiParser_detectProgramMessageUnit(scpi_parser_state_t * state, char * buffer, int len) {
- lex_state_t lex_state;
- scpi_token_t tmp;
+ lex_state_t lex_state = {};
+ scpi_token_t tmp = {};
int result = 0;
// 鍒濆鍖栬瘝娉曞垎鏋�
lex_state.buffer = lex_state.pos = buffer;
--
Gitblit v1.9.1