From af4e630a29e8ddcb11f377d3b0e6f6d580040313 Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: 周五, 12 12月 2014 17:50:29 +0800 Subject: [PATCH] Parser refactoring --- libscpi/src/utils_private.h | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libscpi/src/utils_private.h b/libscpi/src/utils_private.h index 90e4c7a..ed624f3 100644 --- a/libscpi/src/utils_private.h +++ b/libscpi/src/utils_private.h @@ -52,16 +52,17 @@ #endif char * strnpbrk(const char *str, size_t size, const char *set) LOCAL; - bool_t compareStr(const char * str1, size_t len1, const char * str2, size_t len2) LOCAL; + scpi_bool_t compareStr(const char * str1, size_t len1, const char * str2, size_t len2) LOCAL; + scpi_bool_t compareStrAndNum(const char * str1, size_t len1, const char * str2, size_t len2) LOCAL; size_t longToStr(int32_t val, char * str, size_t len, int8_t base) LOCAL; size_t doubleToStr(double val, char * str, size_t len) LOCAL; size_t strToLong(const char * str, int32_t * val, int8_t base) LOCAL; size_t strToDouble(const char * str, double * val) LOCAL; - bool_t locateText(const char * str1, size_t len1, const char ** str2, size_t * len2) LOCAL; - bool_t locateStr(const char * str1, size_t len1, const char ** str2, size_t * len2) LOCAL; + scpi_bool_t locateText(const char * str1, size_t len1, const char ** str2, size_t * len2) LOCAL; + scpi_bool_t locateStr(const char * str1, size_t len1, const char ** str2, size_t * len2) LOCAL; size_t skipWhitespace(const char * cmd, size_t len) LOCAL; - bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len) LOCAL; - bool_t matchCommand(const char * pattern, const char * cmd, size_t len) LOCAL; + scpi_bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len) LOCAL; + scpi_bool_t matchCommand(const char * pattern, const char * cmd, size_t len) LOCAL; #if !HAVE_STRNLEN size_t BSD_strnlen(const char *s, size_t maxlen); -- Gitblit v1.9.1