From 15671f57ea852bc1df5c0d2a358b714eeb097074 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 17 10月 2016 14:27:19 +0800
Subject: [PATCH] Merge pull request #83 from ardovm/master
---
libscpi/src/utils_private.h | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/libscpi/src/utils_private.h b/libscpi/src/utils_private.h
index f864004..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,10 +28,10 @@
/**
* @file scpi_utils.h
* @date Thu Nov 15 10:58:45 UTC 2012
- *
+ *
* @brief Conversion routines and string manipulation routines
- *
- *
+ *
+ *
*/
#ifndef SCPI_UTILS_PRIVATE_H
@@ -69,6 +69,16 @@
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) LOCAL;
#endif
@@ -77,6 +87,17 @@
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
--
Gitblit v1.9.1