From 3c5ca89152f962e0887bd5cf607c69a52c3dd575 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 31 5月 2016 21:50:42 +0800
Subject: [PATCH] Rework compiler detection, fix SCPI_dtostre length limitation
---
libscpi/src/ieee488.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c
index cd527e3..667e9da 100644
--- a/libscpi/src/ieee488.c
+++ b/libscpi/src/ieee488.c
@@ -71,7 +71,7 @@
* @return register value
*/
scpi_reg_val_t SCPI_RegGet(scpi_t * context, scpi_reg_name_t name) {
- if ((name < SCPI_REG_COUNT) && (context->registers != NULL)) {
+ if ((name < SCPI_REG_COUNT) && context) {
return context->registers[name];
} else {
return 0;
@@ -102,7 +102,7 @@
scpi_reg_val_t mask;
scpi_reg_val_t old_val;
- if ((name >= SCPI_REG_COUNT) || (context->registers == NULL)) {
+ if ((name >= SCPI_REG_COUNT) || (context == NULL)) {
return;
}
@@ -213,8 +213,9 @@
int32_t new_ESE;
if (SCPI_ParamInt32(context, &new_ESE, TRUE)) {
SCPI_RegSet(context, SCPI_REG_ESE, (scpi_reg_val_t) new_ESE);
+ return SCPI_RES_OK;
}
- return SCPI_RES_OK;
+ return SCPI_RES_ERR;
}
/**
@@ -303,8 +304,9 @@
int32_t new_SRE;
if (SCPI_ParamInt32(context, &new_SRE, TRUE)) {
SCPI_RegSet(context, SCPI_REG_SRE, (scpi_reg_val_t) new_SRE);
+ return SCPI_RES_OK;
}
- return SCPI_RES_OK;
+ return SCPI_RES_ERR;
}
/**
--
Gitblit v1.9.1