From 730831504cde7db84721e75a8f942ffc32300fe2 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 25 12月 2013 04:56:32 +0800
Subject: [PATCH] Refactor bool_t to scpi_bool_t
---
libscpi/src/utils.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 6a41e54..5b5cf04 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -146,7 +146,7 @@
* @param len2
* @return TRUE if len1==len2 and "len" characters of both strings are equal
*/
-bool_t compareStr(const char * str1, size_t len1, const char * str2, size_t len2) {
+scpi_bool_t compareStr(const char * str1, size_t len1, const char * str2, size_t len2) {
if (len1 != len2) {
return FALSE;
}
@@ -179,7 +179,7 @@
/**
* Test locate text state, if it is correct final state
*/
-static bool_t isFinalState(locate_text_states state) {
+static scpi_bool_t isFinalState(locate_text_states state) {
return (
((state) == STATE_COMMA)
|| ((state) == STATE_LAST_WHITESPACE)
@@ -193,7 +193,7 @@
* @param nfa stores automaton state
* @param c current char processed
*/
-static bool_t locateTextAutomaton(locate_text_nfa * nfa, unsigned char c) {
+static scpi_bool_t locateTextAutomaton(locate_text_nfa * nfa, unsigned char c) {
switch(nfa->state) {
/* first state locating only white spaces */
case STATE_FIRST_WHITESPACE:
@@ -257,7 +257,7 @@
* @param len2 length of result
* @return string str1 contains text and str2 was set
*/
-bool_t locateText(const char * str1, size_t len1, const char ** str2, size_t * len2) {
+scpi_bool_t locateText(const char * str1, size_t len1, const char ** str2, size_t * len2) {
locate_text_nfa nfa;
nfa.state = STATE_FIRST_WHITESPACE;
nfa.startIdx = 0;
@@ -288,7 +288,7 @@
* @param nfa stores automaton state
* @param c current char processed
*/
-static bool_t locateStrAutomaton(locate_text_nfa * nfa, unsigned char c) {
+static scpi_bool_t locateStrAutomaton(locate_text_nfa * nfa, unsigned char c) {
switch(nfa->state) {
/* first state locating only white spaces */
case STATE_FIRST_WHITESPACE:
@@ -332,7 +332,7 @@
* @param len2 length of result
* @return string str1 contains text and str2 was set
*/
-bool_t locateStr(const char * str1, size_t len1, const char ** str2, size_t * len2) {
+scpi_bool_t locateStr(const char * str1, size_t len1, const char ** str2, size_t * len2) {
locate_text_nfa nfa;
nfa.state = STATE_FIRST_WHITESPACE;
nfa.startIdx = 0;
@@ -435,7 +435,7 @@
* @param str_len
* @return
*/
-bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len) {
+scpi_bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len) {
int pattern_sep_pos_short = patternSeparatorShortPos(pattern, pattern_len);
return compareStr(pattern, pattern_len, str, str_len) ||
compareStr(pattern, pattern_sep_pos_short, str, str_len);
@@ -448,8 +448,8 @@
* @param len - max search length
* @return TRUE if pattern matches, FALSE otherwise
*/
-bool_t matchCommand(const char * pattern, const char * cmd, size_t len) {
- bool_t result = FALSE;
+scpi_bool_t matchCommand(const char * pattern, const char * cmd, size_t len) {
+ scpi_bool_t result = FALSE;
int leftFlag = 0; // flag for '[' on left
int rightFlag = 0; // flag for ']' on right
int cmd_sep_pos = 0;
@@ -598,7 +598,7 @@
*
*
*/
-bool_t composeCompoundCommand(char * ptr_prev, size_t len_prev,
+scpi_bool_t composeCompoundCommand(char * ptr_prev, size_t len_prev,
char ** pptr, size_t * plen) {
char * ptr;
size_t len;
--
Gitblit v1.9.1