From 1f3aae322221514a8df3e06c0adf6844a597b025 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 10 4月 2017 19:03:01 +0800
Subject: [PATCH] Merge pull request #85 from richardbarlow/master
---
libscpi/src/utils_private.h | 68 ++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 19 deletions(-)
diff --git a/libscpi/src/utils_private.h b/libscpi/src/utils_private.h
index 255136b..f83c6d4 100644
--- a/libscpi/src/utils_private.h
+++ b/libscpi/src/utils_private.h
@@ -2,7 +2,7 @@
* Copyright (c) 2012-2013 Jan Breuer,
*
* All Rights Reserved
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
@@ -11,7 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -28,14 +28,14 @@
/**
* @file scpi_utils.h
* @date Thu Nov 15 10:58:45 UTC 2012
- *
+ *
* @brief Conversion routines and string manipulation routines
- *
- *
+ *
+ *
*/
-#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"
@@ -46,35 +46,65 @@
#endif
#if defined(__GNUC__) && (__GNUC__ >= 4)
- #define LOCAL __attribute__((visibility ("hidden")))
+#define LOCAL __attribute__((visibility ("hidden")))
#else
- #define LOCAL
+#define LOCAL
#endif
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;
- size_t strToLong(const char * str, int32_t * val, int8_t base) LOCAL;
+ scpi_bool_t compareStrAndNum(const char * str1, size_t len1, const char * str2, size_t len2, int32_t * num) LOCAL;
+ size_t UInt32ToStrBaseSign(uint32_t val, char * str, size_t len, int8_t base, scpi_bool_t sign) LOCAL;
+ size_t UInt64ToStrBaseSign(uint64_t val, char * str, size_t len, int8_t base, scpi_bool_t sign) LOCAL;
+ size_t strBaseToInt32(const char * str, int32_t * val, int8_t base) LOCAL;
+ size_t strBaseToUInt32(const char * str, uint32_t * val, int8_t base) LOCAL;
+ size_t strBaseToInt64(const char * str, int64_t * val, int8_t base) LOCAL;
+ size_t strBaseToUInt64(const char * str, uint64_t * val, int8_t base) LOCAL;
+ size_t strToFloat(const char * str, float * val) 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, int32_t default_value) LOCAL;
+ scpi_bool_t composeCompoundCommand(const scpi_token_t * prev, scpi_token_t * current) LOCAL;
+
+#define SCPI_DTOSTRE_UPPERCASE 1
+#define SCPI_DTOSTRE_ALWAYS_SIGN 2
+#define SCPI_DTOSTRE_PLUS_SIGN 4
+ char * SCPI_dtostre(double __val, char * __s, size_t __ssize, unsigned char __prec, unsigned char __flags);
+
+ scpi_array_format_t SCPI_GetNativeFormat(void);
+ uint16_t SCPI_Swap16(uint16_t val);
+ uint32_t SCPI_Swap32(uint32_t val);
+ uint64_t SCPI_Swap64(uint64_t val);
#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
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION && !USE_MEMORY_ALLOCATION_FREE
+ void scpiheap_init(scpi_error_info_heap_t * heap, char * error_info_heap, size_t error_info_heap_length);
+ char * scpiheap_strndup(scpi_error_info_heap_t * heap, const char *s, size_t n) LOCAL;
+ void scpiheap_free(scpi_error_info_heap_t * heap, char *s, scpi_bool_t rollback) LOCAL;
+ scpi_bool_t scpiheap_get_parts(scpi_error_info_heap_t * heap, const char *s1, size_t * len1, const char ** s2, size_t * len2) LOCAL;
+#endif
+
+#if !HAVE_STRNDUP
+ char *OUR_strndup(const char *s, size_t n);
+#endif
+
+#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 +123,5 @@
}
#endif
-#endif /* SCPI_UTILS_H */
+#endif /* SCPI_UTILS_PRIVATE_H */
--
Gitblit v1.9.1