sola/scpi-parser.git

			@@ -1,30 +1,29 @@
			/*-
			* Copyright (c) 2013 Jan Breuer
			* Richard.hmm
			* Copyright (c) 2012 Jan Breuer
			* BSD 2-Clause License
			*
			* All Rights Reserved
			* Copyright (c) 2012-2018, Jan Breuer, Richard.hmm
			* All rights reserved.
			*
			* Redistribution and use in source and binary forms, with or without
			* modification, are permitted provided that the following conditions are
			* met:
			* 1. Redistributions of source code must retain the above copyright notice,
			* this list of conditions and the following disclaimer.
			* 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.
			* modification, are permitted provided that the following conditions are met:
			*
			* 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
			* DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
			* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
			* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
			* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
			* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
			* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
			* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
			* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
			* * Redistributions of source code must retain the above copyright notice, this
			* list of conditions and the following disclaimer.
			*
			* * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "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
			* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
			* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
			* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
			* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
			* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
			* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
			* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
			*/

			/**
			@@ -297,7 +296,7 @@
			*/
			size_t strBaseToInt64(const char * str, int64_t * val, int8_t base) {
			char * endptr;
			*val = strtoll(str, &endptr, base);
			*val = SCPIDEFINE_strtoll(str, &endptr, base);
			return endptr - str;
			}

			@@ -309,7 +308,7 @@
			*/
			size_t strBaseToUInt64(const char * str, uint64_t * val, int8_t base) {
			char * endptr;
			*val = strtoull(str, &endptr, base);
			*val = SCPIDEFINE_strtoull(str, &endptr, base);
			return endptr - str;
			}

			@@ -321,7 +320,7 @@
			*/
			size_t strToFloat(const char * str, float * val) {
			char * endptr;
			*val = strtof(str, &endptr);
			*val = SCPIDEFINE_strtof(str, &endptr);
			return endptr - str;
			}

			@@ -752,6 +751,19 @@
			}
			#endif

			#if USE_MEMORY_ALLOCATION_FREE && !HAVE_STRNDUP
			char OUR_strndup(const char s, size_t n) {
			size_t len = SCPIDEFINE_strnlen(s, n);
			char * result = malloc(len + 1);
			if (!result) {
			return NULL;
			}
			memcpy(result, s, len);
			result[len] = '\0';
			return result;
			}
			#endif

			#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION && !USE_MEMORY_ALLOCATION_FREE

			/**
			@@ -995,14 +1007,14 @@
			char * SCPI_dtostre(double __val, char * __s, size_t __ssize, unsigned char __prec, unsigned char __flags) {
			char buffer[SCPI_DTOSTRE_BUFFER_SIZE];

			int sign = signbit(__val);
			int sign = SCPIDEFINE_signbit(__val);
			char * s = buffer;
			int decpt;
			if (sign) {
			__val = -__val;
			s[0] = '-';
			s++;
			} else if (!isnan(__val)) {
			} else if (!SCPIDEFINE_isnan(__val)) {
			if (SCPI_DTOSTRE_PLUS_SIGN & __flags) {
			s[0] = '+';
			s++;
			@@ -1012,13 +1024,14 @@
			}
			}

			if (!isfinite(__val)) {
			if (isnan(__val)) {
			if (!SCPIDEFINE_isfinite(__val)) {
			if (SCPIDEFINE_isnan(__val)) {
			strcpy(s, (__flags & SCPI_DTOSTRE_UPPERCASE) ? "NAN" : "nan");
			} else {
			strcpy(s, (__flags & SCPI_DTOSTRE_UPPERCASE) ? "INF" : "inf");
			}
			strncpy(__s, buffer, __ssize);
			__s[__ssize - 1] = '\0';
			return __s;
			}

			@@ -1072,6 +1085,7 @@
			}

			strncpy(__s, buffer, __ssize);
			__s[__ssize - 1] = '\0';
			return __s;
			}

			@@ -1105,10 +1119,10 @@
			* @return
			*/
			uint32_t SCPI_Swap32(uint32_t val) {
			return ((val & 0x000000FF) << 24) \|
			((val & 0x0000FF00) << 8) \|
			((val & 0x00FF0000) >> 8) \|
			((val & 0xFF000000) >> 24);
			return ((val & 0x000000FFul) << 24) \|
			((val & 0x0000FF00ul) << 8) \|
			((val & 0x00FF0000ul) >> 8) \|
			((val & 0xFF000000ul) >> 24);
			}

			/**
			@@ -1117,12 +1131,12 @@
			* @return
			*/
			uint64_t SCPI_Swap64(uint64_t val) {
			return ((val & 0x00000000000000FFul) << 56) \|
			((val & 0x000000000000FF00ul) << 40) \|
			((val & 0x0000000000FF0000ul) << 24) \|
			((val & 0x00000000FF000000ul) << 8) \|
			((val & 0x000000FF00000000ul) >> 8) \|
			((val & 0x0000FF0000000000ul) >> 24) \|
			((val & 0x00FF000000000000ul) >> 40) \|
			((val & 0xFF00000000000000ul) >> 56);
			return ((val & 0x00000000000000FFull) << 56) \|
			((val & 0x000000000000FF00ull) << 40) \|
			((val & 0x0000000000FF0000ull) << 24) \|
			((val & 0x00000000FF000000ull) << 8) \|
			((val & 0x000000FF00000000ull) >> 8) \|
			((val & 0x0000FF0000000000ull) >> 24) \|
			((val & 0x00FF000000000000ull) >> 40) \|
			((val & 0xFF00000000000000ull) >> 56);
			}