From 3192f8a0084f8a6f82ac18e187d9db30e524ff9b Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@mobatime.cz>
Date: 周二, 15 8月 2017 00:33:56 +0800
Subject: [PATCH] Merge branch 'jfichtner-OperationStatusRegAdditions'
---
libscpi/src/error.c | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index e07ced3..f5f4699 100644
--- a/libscpi/src/error.c
+++ b/libscpi/src/error.c
@@ -40,11 +40,12 @@
#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,14 @@
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);
+ char * info_ptr = info ? SCPIDEFINE_strndup(&context->error_info_heap, info, info_len) : NULL;
+ 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 +165,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 +187,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 +211,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
--
Gitblit v1.9.1