From 0347bda93a1f251c8bc36d56d5dd9c02daf8af64 Mon Sep 17 00:00:00 2001
From: Arrigo Marchiori <ardovm@yahoo.it>
Date: 周五, 14 10月 2016 23:19:57 +0800
Subject: [PATCH] restore C99 compliance.
---
libscpi/src/error.c | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index bc370a9..057151e 100644
--- a/libscpi/src/error.c
+++ b/libscpi/src/error.c
@@ -40,6 +40,13 @@
#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)
+#endif
/**
* Initialize error queue
@@ -100,8 +107,7 @@
*/
scpi_bool_t SCPI_ErrorPop(scpi_t * context, scpi_error_t * error) {
if (!error || !context) return FALSE;
- error->error_code = 0;
- error->device_dependent_info = NULL;
+ SCPI_ERROR_SETVAL(error, 0, NULL);
fifo_remove(&context->error_queue, error);
SCPI_ErrorEmitEmpty(context);
@@ -122,10 +128,16 @@
return result;
}
-static scpi_bool_t SCPI_ErrorAddInternal(scpi_t * context, int16_t err, char * info) {
- if (!fifo_add(&context->error_queue, err, info)) {
- fifo_remove_last(&context->error_queue, NULL);
- fifo_add(&context->error_queue, SCPI_ERROR_QUEUE_OVERFLOW, NULL);
+static scpi_bool_t SCPI_ErrorAddInternal(scpi_t * context, int16_t err, char * info, size_t info_len) {
+ scpi_error_t error_value;
+ 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, true);
+ SCPI_ERROR_SETVAL(&error_value, SCPI_ERROR_QUEUE_OVERFLOW, NULL);
+ fifo_add(&context->error_queue, &error_value);
return FALSE;
}
return TRUE;
@@ -134,7 +146,7 @@
struct error_reg {
int16_t from;
int16_t to;
- scpi_reg_val_t bit;
+ scpi_reg_val_t esrBit;
};
#define ERROR_DEFS_N 9
@@ -153,33 +165,28 @@
/**
* 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) {
+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_strdup(&context->error_info_heap, info);
+ /* 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)) {
- SCPI_RegSetBits(context, SCPI_REG_ESR, errs[i].bit);
+ SCPI_RegSetBits(context, SCPI_REG_ESR, errs[i].esrBit);
}
}
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) {
@@ -193,7 +200,7 @@
* @param err - error number
*/
void SCPI_ErrorPush(scpi_t * context, int16_t err) {
- SCPI_ErrorPushEx(context, err, NULL);
+ SCPI_ErrorPushEx(context, err, NULL, 0);
return;
}
@@ -204,21 +211,20 @@
*/
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
#else
#define XE(def, val, str)
#endif
- LIST_OF_ERRORS
+ LIST_OF_ERRORS
#if USE_USER_ERROR_LIST
- LIST_OF_USER_ERRORS
+ LIST_OF_USER_ERRORS
#endif
#undef X
#undef XE
- default: return "Unknown error";
+ default: return "Unknown error";
}
}
--
Gitblit v1.9.1