sola/scpi-parser.git

			@@ -1,30 +1,30 @@
			/*-
			* Copyright (c) 2012-2013 Jan Breuer,
			* BSD 2-Clause License
			*
			* All Rights Reserved
			* Copyright (c) 2012-2018, 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:
			* 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.
			*/

			/**
			* @file scpi_error.c
			* @date Thu Nov 15 10:58:45 UTC 2012
			@@ -36,15 +36,16 @@

			#include <stdint.h>

			#include "scpi/parser.h"
			#include "scpi/ieee488.h"
			#include "scpi/error.h"
			#include <scpi/parser.h>
			#include <scpi/ieee488.h>
			#include <scpi/error.h>
			#include "fifo_private.h"
			#include <scpi/constants.h>

			#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
			#define SCPI_ERROR_SETVAL(e, c, i) do { (e)->error_code = (c); (e)->device_dependent_info = (i); } while(0)
			#else
			#define SCPI_ERROR_SETVAL(e, c, i) do { (e)->error_code = (c); } while(0)
			#define SCPI_ERROR_SETVAL(e, c, i) do { (e)->error_code = (c); (void)(i);} while(0)
			#endif

			/**
			@@ -127,12 +128,20 @@
			return result;
			}

			static scpi_bool_t SCPI_ErrorAddInternal(scpi_t * context, int16_t err, char * info) {
			static scpi_bool_t SCPI_ErrorAddInternal(scpi_t * context, int16_t err, char * info, size_t info_len) {
			scpi_error_t error_value;
			SCPI_ERROR_SETVAL(&error_value, err, info);
			/* SCPIDEFINE_strndup is sometimes a dumy that does not reference it's arguments.
			Since info_len is not referenced elsewhere caoing to void prevents unusd argument warnings */
			(void) info_len;
			char * info_ptr = NULL;
			if (info) {
			info_ptr = SCPIDEFINE_strndup(&context->error_info_heap, info, info_len);
			}
			SCPI_ERROR_SETVAL(&error_value, err, info_ptr);
			if (!fifo_add(&context->error_queue, &error_value)) {
			SCPIDEFINE_free(&context->error_info_heap, error_value.device_dependent_info, true);
			fifo_remove_last(&context->error_queue, &error_value);
			SCPIDEFINE_free(&context->error_info_heap, error_value.device_dependent_info, false);
			SCPIDEFINE_free(&context->error_info_heap, error_value.device_dependent_info, true);
			SCPI_ERROR_SETVAL(&error_value, SCPI_ERROR_QUEUE_OVERFLOW, NULL);
			fifo_add(&context->error_queue, &error_value);
			return FALSE;
			@@ -162,20 +171,18 @@

			/**
			* Push error to queue
			* @param context - scpi context
			* @param context
			* @param err - error number
			* @param info - additional text information or NULL for no text
			* @param info_len - length of text or 0 for automatic length
			*/
			void SCPI_ErrorPushEx(scpi_t * context, int16_t err, char * info, size_t info_len) {
			int i;
			char * info_ptr = NULL;

			#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
			if (info) {
			info_ptr = SCPIDEFINE_strndup(&context->error_info_heap, info, info_len);
			/* automatic calculation of length */
			if (info && info_len == 0) {
			info_len = SCPIDEFINE_strnlen(info, SCPI_STD_ERROR_DESC_MAX_STRING_LENGTH);
			}
			#endif

			scpi_bool_t queue_overflow = !SCPI_ErrorAddInternal(context, err, info_ptr);
			scpi_bool_t queue_overflow = !SCPI_ErrorAddInternal(context, err, info, info_len);

			for (i = 0; i < ERROR_DEFS_N; i++) {
			if ((err <= errs[i].from) && (err >= errs[i].to)) {
			@@ -186,9 +193,6 @@
			SCPI_ErrorEmit(context, err);
			if (queue_overflow) {
			SCPI_ErrorEmit(context, SCPI_ERROR_QUEUE_OVERFLOW);
			#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
			SCPIDEFINE_free(&context->error_info_heap, info_ptr, true);
			#endif
			}

			if (context) {
			@@ -213,7 +217,6 @@
			*/
			const char * SCPI_ErrorTranslate(int16_t err) {
			switch (err) {
			case 0: return "No error";
			#define X(def, val, str) case def: return str;
			#if USE_FULL_ERROR_LIST
			#define XE X