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 | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/libscpi/src/error.c b/libscpi/src/error.c index b2bedfc..f5f4699 100644 --- a/libscpi/src/error.c +++ b/libscpi/src/error.c @@ -45,7 +45,7 @@ #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 /** @@ -211,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