From be3350c620036306fb5f2db3535cb110f187d5e8 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 24 9月 2014 23:46:36 +0800
Subject: [PATCH] Refactor token_t and token_type_t to have scpi_ prefix
---
libscpi/src/parser.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index ba06728..595e0e6 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -373,7 +373,7 @@
/* parsing parameters */
scpi_bool_t SCPI_Parameter(scpi_t * context, scpi_parameter_t * parameter, scpi_bool_t mandatory) {
- token_t token;
+ scpi_token_t token;
lex_state_t * state;
int32_t value;
@@ -524,8 +524,8 @@
}
}
-int parseProgramData(lex_state_t * state, token_t * token) {
- token_t tmp;
+int parseProgramData(lex_state_t * state, scpi_token_t * token) {
+ scpi_token_t tmp;
int result = 0;
int wsLen;
int suffixLen;
@@ -556,10 +556,10 @@
return result + realLen;
}
-int parseAllProgramData(lex_state_t * state, token_t * token, int * numberOfParameters) {
+int parseAllProgramData(lex_state_t * state, scpi_token_t * token, int * numberOfParameters) {
int result;
- token_t tmp;
+ scpi_token_t tmp;
int paramCount = 0;
token->len = -1;
@@ -599,7 +599,7 @@
return token->len;
}
-static void invalidateToken(token_t * token, const char * ptr) {
+static void invalidateToken(scpi_token_t * token, const char * ptr) {
token->len = 0;
token->ptr = ptr;
token->type = TokUnknown;
@@ -607,7 +607,7 @@
int detectProgramMessageUnit(scpi_parser_state_t * state, const char * buffer, int len) {
lex_state_t lex_state;
- token_t tmp;
+ scpi_token_t tmp;
int result = 0;
lex_state.buffer = lex_state.pos = buffer;
--
Gitblit v1.9.1