From 794b64e3f68ae2315b8bbd2c01b23c05e0cc295b Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 05 8月 2015 02:55:14 +0800
Subject: [PATCH] Fix `static` in utils.c
---
libscpi/src/units.c | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/libscpi/src/units.c b/libscpi/src/units.c
index 792df76..517bb1a 100644
--- a/libscpi/src/units.c
+++ b/libscpi/src/units.c
@@ -38,6 +38,7 @@
#include "scpi/parser.h"
#include "scpi/units.h"
#include "utils_private.h"
+#include "scpi/utils.h"
#include "scpi/error.h"
#include "lexer_private.h"
@@ -112,6 +113,7 @@
{/* name */ "NAN", /* type */ SCPI_NUM_NAN},
{/* name */ "INFinity", /* type */ SCPI_NUM_INF},
{/* name */ "NINF", /* type */ SCPI_NUM_NINF},
+ {/* name */ "AUTO", /* type */ SCPI_NUM_AUTO},
SCPI_CHOICE_LIST_END,
};
@@ -204,7 +206,7 @@
lex_state_t state;
scpi_parameter_t param;
scpi_bool_t result;
- int32_t intval;
+ int32_t tag;
if (!value) {
SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
@@ -229,7 +231,7 @@
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX:
case SCPI_TOKEN_PROGRAM_MNEMONIC:
value->unit = SCPI_UNIT_NONE;
- value->type = SCPI_NUM_NUMBER;
+ value->special = FALSE;
result = TRUE;
break;
}
@@ -278,10 +280,10 @@
scpiLex_CharacterProgramData(&state, &token);
/* convert string to special number type */
- SCPI_ParamToChoice(context, &token, special, &intval);
+ SCPI_ParamToChoice(context, &token, special, &tag);
- value->type = intval;
- value->value = 0;
+ value->special = TRUE;
+ value->tag = tag;
break;
default:
@@ -308,12 +310,17 @@
return 0;
}
- if (SCPI_ChoiceToName(special, value->type, &type)) {
- strncpy(str, type, len);
- return min(strlen(type), len);
+ if (value->special) {
+ if (SCPI_ChoiceToName(special, value->tag, &type)) {
+ strncpy(str, type, len);
+ return min(strlen(type), len);
+ } else {
+ str[0] = 0;
+ return 0;
+ }
}
- result = doubleToStr(value->value, str, len);
+ result = SCPI_DoubleToStr(value->value, str, len);
unit = translateUnitInverse(context->units, value->unit);
--
Gitblit v1.9.1