From 148070985fd49efeebfb3a93865a6503d8b1dd4c Mon Sep 17 00:00:00 2001
From: Chernov Dmitriy <cd_work@mail.ru>
Date: 周一, 29 2月 2016 16:01:24 +0800
Subject: [PATCH] strdup(malloc)/free ready.
---
libscpi/src/ieee488.c | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c
index 5212c05..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,10 +102,10 @@
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;
}
-
+
/* store old register value */
old_val = context->registers[name];
@@ -148,8 +148,8 @@
case SCPI_REG_OPERE:
regUpdate(context, SCPI_REG_OPER);
break;
-
-
+
+
case SCPI_REG_COUNT:
/* nothing to do */
break;
@@ -212,9 +212,10 @@
scpi_result_t SCPI_CoreEse(scpi_t * context) {
int32_t new_ESE;
if (SCPI_ParamInt32(context, &new_ESE, TRUE)) {
- SCPI_RegSet(context, SCPI_REG_ESE, (scpi_reg_val_t)new_ESE);
+ SCPI_RegSet(context, SCPI_REG_ESE, (scpi_reg_val_t) new_ESE);
+ return SCPI_RES_OK;
}
- return SCPI_RES_OK;
+ return SCPI_RES_ERR;
}
/**
@@ -251,7 +252,7 @@
*/
scpi_result_t SCPI_CoreIdnQ(scpi_t * context) {
int i;
- for (i = 0; i<4; i++) {
+ for (i = 0; i < 4; i++) {
if (context->idn[i]) {
SCPI_ResultMnemonic(context, context->idn[i]);
} else {
@@ -302,9 +303,10 @@
scpi_result_t SCPI_CoreSre(scpi_t * context) {
int32_t new_SRE;
if (SCPI_ParamInt32(context, &new_SRE, TRUE)) {
- SCPI_RegSet(context, SCPI_REG_SRE, (scpi_reg_val_t)new_SRE);
+ 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