From bf7f722d0f42b37a83df91d0a62544c948c4cb66 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 24 4月 2016 20:24:11 +0800
Subject: [PATCH] Extend travis script to test all configurations with device dependent error
---
libscpi/src/error.c | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index 45f12d5..e07ced3 100644
--- a/libscpi/src/error.c
+++ b/libscpi/src/error.c
@@ -41,6 +41,12 @@
#include "scpi/error.h"
#include "fifo_private.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
* @param context - scpi context
@@ -100,8 +106,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);
@@ -123,9 +128,13 @@
}
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);
+ scpi_error_t error_value;
+ SCPI_ERROR_SETVAL(&error_value, err, info);
+ if (!fifo_add(&context->error_queue, &error_value)) {
+ fifo_remove_last(&context->error_queue, &error_value);
+ SCPIDEFINE_free(&context->error_info_heap, error_value.device_dependent_info, false);
+ SCPI_ERROR_SETVAL(&error_value, SCPI_ERROR_QUEUE_OVERFLOW, NULL);
+ fifo_add(&context->error_queue, &error_value);
return FALSE;
}
return TRUE;
@@ -156,13 +165,13 @@
* @param context - scpi context
* @param err - error number
*/
-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);
+ info_ptr = SCPIDEFINE_strndup(&context->error_info_heap, info, info_len);
}
#endif
@@ -193,7 +202,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;
}
--
Gitblit v1.9.1