From 3592124b3fc00f919302097e5c90d0af14a58d92 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 21 10月 2013 17:38:24 +0800
Subject: [PATCH] Merge error definitions from experimental branch
---
libscpi/src/error.c | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index 2705ff1..b85fa56 100644
--- a/libscpi/src/error.c
+++ b/libscpi/src/error.c
@@ -174,14 +174,9 @@
const char * SCPI_ErrorTranslate(int16_t err) {
switch (err) {
case 0: return "No error";
- case SCPI_ERROR_SYNTAX: return "Syntax error";
- case SCPI_ERROR_INVALID_SEPARATOR: return "Invalid separator";
- case SCPI_ERROR_UNDEFINED_HEADER: return "Undefined header";
- case SCPI_ERROR_PARAMETER_NOT_ALLOWED: return "Parameter not allowed";
- case SCPI_ERROR_MISSING_PARAMETER: return "Missing parameter";
- case SCPI_ERROR_INVALID_SUFFIX: return "Invalid suffix";
- case SCPI_ERROR_SUFFIX_NOT_ALLOWED: return "Suffix not allowed";
- case SCPI_ERROR_ILLEGAL_PARAMETER_VALUE: return "Illegal parameter value";
+ #define X(def, val, str) case def: return str;
+ LIST_OF_ERRORS
+ #undef X
default: return "Unknown error";
}
}
--
Gitblit v1.9.1