From 94c8faab9f5b7dfcf11b6a0084cf54029badb125 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 24 4月 2016 18:25:36 +0800
Subject: [PATCH] Fix tests for device dependent info, convert to strndup, fix out of bounds access
---
libscpi/inc/scpi/expression.h | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/libscpi/inc/scpi/expression.h b/libscpi/inc/scpi/expression.h
index dedda20..a7bbff7 100644
--- a/libscpi/inc/scpi/expression.h
+++ b/libscpi/inc/scpi/expression.h
@@ -41,7 +41,19 @@
#ifdef __cplusplus
extern "C" {
#endif
-
+
+ enum _scpi_expr_result_t {
+ SCPI_EXPR_OK = 0,
+ SCPI_EXPR_ERROR,
+ SCPI_EXPR_NO_MORE,
+ };
+ typedef enum _scpi_expr_result_t scpi_expr_result_t;
+
+ scpi_expr_result_t SCPI_ExprNumericListEntry(scpi_t * context, scpi_parameter_t * param, int index, scpi_bool_t * isRange, scpi_parameter_t * valueFrom, scpi_parameter_t * valueTo);
+ scpi_expr_result_t SCPI_ExprNumericListEntryInt(scpi_t * context, scpi_parameter_t * param, int index, scpi_bool_t * isRange, int32_t * valueFrom, int32_t * valueTo);
+ scpi_expr_result_t SCPI_ExprNumericListEntryDouble(scpi_t * context, scpi_parameter_t * param, int index, scpi_bool_t * isRange, double * valueFrom, double * valueTo);
+ scpi_expr_result_t SCPI_ExprChannelListEntry(scpi_t * context, scpi_parameter_t * param, int index, scpi_bool_t * isRange, int32_t * valuesFrom, int32_t * valuesTo, size_t length, size_t * dimensions);
+
#ifdef __cplusplus
}
#endif
--
Gitblit v1.9.1