Rename parse_numericrange to UA_NumericRange_parseFromString

src/server/ua_server_internal.h

@@ -223,7 +223,7 @@ UA_StatusCode UA_Server_delayedFree(UA_Server *server, void *data);
 /*********************/
 
 UA_StatusCode
-parse_numericrange(const UA_String *str, UA_NumericRange *range);
+UA_NumericRange_parseFromString(UA_NumericRange *range, const UA_String *str);
 
 UA_UInt16 addNamespace(UA_Server *server, const UA_String name);
 

src/server/ua_server_utils.c

@@ -31,7 +31,7 @@ readDimension(UA_Byte *buf, size_t buflen, UA_NumericRangeDimension *dim) {
 }
 
 UA_StatusCode
-parse_numericrange(const UA_String *str, UA_NumericRange *range) {
+UA_NumericRange_parseFromString(UA_NumericRange *range, const UA_String *str) {
     size_t idx = 0;
     size_t dimensionsMax = 0;
     UA_NumericRangeDimension *dimensions = NULL;

src/server/ua_services_attribute.c

@@ -513,7 +513,7 @@ readValueAttributeComplete(UA_Server *server, const UA_VariableNode *vn,
     UA_NumericRange *rangeptr = NULL;
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     if(indexRange && indexRange->length > 0) {
-        retval = parse_numericrange(indexRange, &range);
+        retval = UA_NumericRange_parseFromString(&range, indexRange);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
         rangeptr = ⦥
@@ -588,7 +588,7 @@ writeValueAttribute(UA_Server *server, UA_VariableNode *node,
     UA_NumericRange *rangeptr = NULL;
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     if(indexRange && indexRange->length > 0) {
-        retval = parse_numericrange(indexRange, &range);
+        retval = UA_NumericRange_parseFromString(&range, indexRange);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
         rangeptr = ⦥

tests/CMakeLists.txt

@@ -1,6 +1,7 @@
 include_directories(${PROJECT_SOURCE_DIR}/include)
 include_directories(${PROJECT_SOURCE_DIR}/deps)
 include_directories(${PROJECT_SOURCE_DIR}/src)
+include_directories(${PROJECT_SOURCE_DIR}/src/server)
 include_directories(${PROJECT_SOURCE_DIR}/plugins)
 include_directories(${PROJECT_BINARY_DIR}/src_generated)
 include_directories(${CHECK_INCLUDE_DIRS})

tests/check_types_range.c

@@ -4,16 +4,13 @@
 
 #include "ua_types.h"
 #include "ua_types_generated_handling.h"
-#include "ua_util.h"
+#include "ua_server_internal.h"
 #include "check.h"
 
-/* copied definition */
-UA_StatusCode parse_numericrange(const UA_String *str, UA_NumericRange *range);
-
 START_TEST(parseRange) {
     UA_NumericRange range;
     UA_String str = UA_STRING("1:2,0:3,5");
-    UA_StatusCode retval = parse_numericrange(&str, &range);
+    UA_StatusCode retval = UA_NumericRange_parseFromString(&range, &str);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(range.dimensionsSize,3);
     ck_assert_int_eq(range.dimensions[0].min,1);
@@ -28,7 +25,7 @@ START_TEST(parseRange) {
 START_TEST(parseRangeMinEqualMax) {
     UA_NumericRange range;
     UA_String str = UA_STRING("1:2,1");
-    UA_StatusCode retval = parse_numericrange(&str, &range);
+    UA_StatusCode retval = UA_NumericRange_parseFromString(&range, &str);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(range.dimensionsSize,2);
     ck_assert_int_eq(range.dimensions[0].min,1);
@@ -47,7 +44,7 @@ START_TEST(copySimpleArrayRange) {
 
     UA_NumericRange r;
     UA_String sr = UA_STRING("1:3");
-    UA_StatusCode retval = parse_numericrange(&sr, &r);
+    UA_StatusCode retval = UA_NumericRange_parseFromString(&r, &sr);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
     retval = UA_Variant_copyRange(&v, &v2, r);
@@ -71,7 +68,7 @@ START_TEST(copyIntoStringArrayRange) {
 
     UA_NumericRange r;
     UA_String sr = UA_STRING("0:1,1:2");
-    UA_StatusCode retval = parse_numericrange(&sr, &r);
+    UA_StatusCode retval = UA_NumericRange_parseFromString(&r, &sr);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
     retval = UA_Variant_copyRange(&v, &v2, r);