From ed07df16da675c4c123e02a996822daf13d69c63 Mon Sep 17 00:00:00 2001
From: lhoerl <coder@lolux.de>
Date: 周一, 03 8月 2015 22:42:07 +0800
Subject: [PATCH] added full SCPI error messages added list for device dependent error messages some minor changes to get rid of compiler warnings added support for Keil ARM compiler added support for National Instruments CVI compiler removed bug if(c = '\0')...
---
libscpi/src/utils_private.h | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/libscpi/src/utils_private.h b/libscpi/src/utils_private.h
index 255136b..aefdf8f 100644
--- a/libscpi/src/utils_private.h
+++ b/libscpi/src/utils_private.h
@@ -34,8 +34,8 @@
*
*/
-#ifndef SCPI_UTILS_H
-#define SCPI_UTILS_H
+#ifndef SCPI_UTILS_PRIVATE_H
+#define SCPI_UTILS_PRIVATE_H
#include <stdint.h>
#include "scpi/config.h"
@@ -53,28 +53,31 @@
char * strnpbrk(const char *str, size_t size, const char *set) 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;
+ scpi_bool_t compareStrAndNum(const char * str1, size_t len1, const char * str2, size_t len2, int32_t * num) LOCAL;
size_t strToLong(const char * str, int32_t * val, int8_t base) LOCAL;
size_t strToDouble(const char * str, double * val) 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;
- 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;
- scpi_bool_t composeCompoundCommand(const scpi_token_t * prev, scpi_token_t * current);
+ scpi_bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len, int32_t * num) LOCAL;
+ scpi_bool_t matchCommand(const char * pattern, const char * cmd, size_t len, int32_t *numbers, size_t numbers_len) LOCAL;
+ scpi_bool_t composeCompoundCommand(const scpi_token_t * prev, scpi_token_t * current) LOCAL;
#if !HAVE_STRNLEN
- size_t BSD_strnlen(const char *s, size_t maxlen);
+ size_t BSD_strnlen(const char *s, size_t maxlen) LOCAL;
#endif
#if !HAVE_STRNCASECMP && !HAVE_STRNICMP
- int OUR_strncasecmp(const char *s1, const char *s2, size_t n);
+ int OUR_strncasecmp(const char *s1, const char *s2, size_t n) LOCAL;
#endif
-#define min(a, b) (((a) < (b)) ? (a) : (b))
-#define max(a, b) (((a) > (b)) ? (a) : (b))
+#ifndef min
+ #define min(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+
+#ifndef max
+ #define max(a, b) (((a) > (b)) ? (a) : (b))
+#endif
#if 0
#define max(a,b) \
@@ -93,5 +96,5 @@
}
#endif
-#endif /* SCPI_UTILS_H */
+#endif /* SCPI_UTILS_PRIVATE_H */
--
Gitblit v1.9.1