From 39fdcb0c57bfeba598f00d77f190e731f26b25a1 Mon Sep 17 00:00:00 2001
From: sola.lu <sola.lu@greentest.com.cn>
Date: 周四, 24 4月 2025 18:25:01 +0800
Subject: [PATCH] 1.修改一下，把当前库改为刚从origin仓库拉去下来，然后添加了cmake构建文件的状态。
---
libscpi/src/units.c | 89 ++++++++++++++++++++++++--------------------
1 files changed, 48 insertions(+), 41 deletions(-)
diff --git a/libscpi/src/units.c b/libscpi/src/units.c
index b13b467..e68af41 100644
--- a/libscpi/src/units.c
+++ b/libscpi/src/units.c
@@ -1,28 +1,29 @@
/*-
- * Copyright (c) 2012-2013 Jan Breuer,
+ * BSD 2-Clause License
*
- * All Rights Reserved
+ * Copyright (c) 2012-2018, Jan Breuer
+ * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ * modification, are permitted provided that the following conditions are met:
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
@@ -63,7 +64,7 @@
* units definition IEEE 488.2-1992 tab 7-1
*/
const scpi_unit_def_t scpi_units_def[] = {
-#if USE_UNITS_PARICLES
+#if USE_UNITS_PARTICLES
/* Absorbet dose */
{/* name */ "GY", /* unit */ SCPI_UNIT_GRAY, /* mult */ 1},
@@ -90,7 +91,7 @@
/* Mass */
{/* name */ "U", /* unit */ SCPI_UNIT_ATOMIC_MASS, /* mult */ 1},
-#endif /* USE_UNITS_PARICLES */
+#endif /* USE_UNITS_PARTICLES */
#if USE_UNITS_ANGLE
/* Angle */
@@ -248,7 +249,7 @@
/* Temperature */
{/* name */ "CEL", /* unit */ SCPI_UNIT_CELSIUS, /* mult */ 1},
#if USE_UNITS_IMPERIAL
- {/* name */ "FAR", /* unit */ SCPI_UNIT_FAGRENHEIT, /* mult */ 1},
+ {/* name */ "FAR", /* unit */ SCPI_UNIT_FAHRENHEIT, /* mult */ 1},
#endif /* USE_UNITS_IMPERIAL */
{/* name */ "K", /* unit */ SCPI_UNIT_KELVIN, /* mult */ 1},
#endif /* USE_UNITS_TEMPERATURE */
@@ -355,7 +356,7 @@
return FALSE;
}
- value->value *= unitDef->mult;
+ value->content.value *= unitDef->mult;
value->unit = unitDef->unit;
return TRUE;
@@ -426,23 +427,23 @@
switch (param.type) {
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA:
- SCPI_ParamToDouble(context, ¶m, &(value->value));
+ SCPI_ParamToDouble(context, ¶m, &(value->content.value));
break;
case SCPI_TOKEN_HEXNUM:
- SCPI_ParamToDouble(context, ¶m, &(value->value));
+ SCPI_ParamToDouble(context, ¶m, &(value->content.value));
break;
case SCPI_TOKEN_OCTNUM:
- SCPI_ParamToDouble(context, ¶m, &(value->value));
+ SCPI_ParamToDouble(context, ¶m, &(value->content.value));
break;
case SCPI_TOKEN_BINNUM:
- SCPI_ParamToDouble(context, ¶m, &(value->value));
+ SCPI_ParamToDouble(context, ¶m, &(value->content.value));
break;
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX:
scpiLex_DecimalNumericProgramData(&state, &token);
scpiLex_WhiteSpace(&state, &token);
scpiLex_SuffixProgramData(&state, &token);
- SCPI_ParamToDouble(context, ¶m, &(value->value));
+ SCPI_ParamToDouble(context, ¶m, &(value->content.value));
result = transformNumber(context, token.ptr, token.len, value);
break;
@@ -454,7 +455,7 @@
result = SCPI_ParamToChoice(context, &token, special, &tag);
value->special = TRUE;
- value->tag = tag;
+ value->content.tag = tag;
break;
default:
@@ -469,7 +470,7 @@
* @param context
* @param value number value
* @param str target string
- * @param len max length of string
+ * @param len max length of string including null-character termination
* @return number of chars written to string
*/
size_t SCPI_NumberToStr(scpi_t * context, const scpi_choice_def_t * special, scpi_number_t * value, char * str, size_t len) {
@@ -477,28 +478,34 @@
const char * unit;
size_t result;
- if (!value || !str) {
+ if (!value || !str || len==0) {
return 0;
}
if (value->special) {
- if (SCPI_ChoiceToName(special, value->tag, &type)) {
+ if (SCPI_ChoiceToName(special, value->content.tag, &type)) {
strncpy(str, type, len);
- return min(strlen(type), len);
+ result = SCPIDEFINE_strnlen(str, len - 1);
+ str[result] = '\0';
+ return result;
} else {
- str[0] = 0;
+ str[0] = '\0';
return 0;
}
}
- result = SCPI_DoubleToStr(value->value, str, len);
+ result = SCPI_DoubleToStr(value->content.value, str, len);
- unit = translateUnitInverse(context->units, value->unit);
+ if (result + 1 < len) {
+ unit = translateUnitInverse(context->units, value->unit);
- if (unit) {
- strncat(str, " ", len);
- strncat(str, unit, len);
- result += strlen(unit) + 1;
+ if (unit) {
+ strncat(str, " ", len - result);
+ if (result + 2 < len) {
+ strncat(str, unit, len - result - 1);
+ }
+ result = strlen(str);
+ }
}
return result;
--
Gitblit v1.9.1