From ba22a750093f5b918aefd58ba698f38dff6a14e1 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 20 6月 2013 22:03:49 +0800
Subject: [PATCH] Unexpected character handling

---
 libscpi/src/utils.h |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/libscpi/src/utils.h b/libscpi/src/utils.h
index 7429246..f7c5c5b 100644
--- a/libscpi/src/utils.h
+++ b/libscpi/src/utils.h
@@ -38,26 +38,40 @@
 #define	SCPI_UTILS_H
 
 #include <stdint.h>
+#include "scpi/config.h"
 #include "scpi/types.h"
 
 #ifdef	__cplusplus
 extern "C" {
 #endif
 
+#if defined(__GNUC__) && (__GNUC__ >= 4)
     #define LOCAL __attribute__((visibility ("hidden")))
+#else
+    #define LOCAL
+#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;
-    size_t longToStr(int32_t val, char * str, size_t len) 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) 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, char ** str2, size_t * len2) LOCAL;
-    bool_t locateStr(const char * str1, size_t len1, char ** str2, size_t * len2) 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;
     size_t skipWhitespace(const char * cmd, size_t len) LOCAL;
+    size_t skipColon(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;
 
+#if !HAVE_STRNLEN
+    size_t BSD_strnlen(const char *s, size_t maxlen);
+#endif
 
+#define min(a, b)  (((a) < (b)) ? (a) : (b))
+#define max(a, b)  (((a) > (b)) ? (a) : (b))
+
+#if 0
 #define max(a,b) \
    ({ __typeof__ (a) _a = (a); \
        __typeof__ (b) _b = (b); \
@@ -68,6 +82,8 @@
        __typeof__ (b) _b = (b); \
      _a < _b ? _a : _b; })
 
+#endif
+
 #ifdef	__cplusplus
 }
 #endif

--
Gitblit v1.9.1