Quellcode durchsuchen

fix a shadowed variable

Julius Pfrommer vor 9 Jahren
Ursprung
Commit
960b9efa7c
3 geänderte Dateien mit 9 neuen und 20 gelöschten Zeilen
  1. 2 2
      CMakeLists.txt
  2. 7 7
      src/ua_types.c
  3. 0 11
      tests/check_services_attributes.c

+ 2 - 2
CMakeLists.txt

@@ -429,8 +429,8 @@ if(BUILD_EXAMPLES)
 					           ${PROJECT_SOURCE_DIR}/tools/pyUANamespace/NodeID_Blacklist_FullNS0.txt
 					           ${PROJECT_SOURCE_DIR}/examples/server_nodeset.xml)
 					   
-	# add_executable(server_nodeset ${PROJECT_SOURCE_DIR}/examples/server_nodeset.c ${PROJECT_BINARY_DIR}/src_generated/nodeset.c $<TARGET_OBJECTS:open62541-object>)
-	# target_link_libraries(server_nodeset ${LIBS})
+	add_executable(server_nodeset ${PROJECT_SOURCE_DIR}/examples/server_nodeset.c ${PROJECT_BINARY_DIR}/src_generated/nodeset.c $<TARGET_OBJECTS:open62541-object>)
+	target_link_libraries(server_nodeset ${LIBS})
 
 	if(ENABLE_METHODCALLS)
 	  add_executable(server_method ${PROJECT_SOURCE_DIR}/examples/server_method.c $<TARGET_OBJECTS:open62541-object>)

+ 7 - 7
src/ua_types.c

@@ -38,14 +38,14 @@
 /* Random Number Generator */
 /***************************/
 
-static UA_THREAD_LOCAL pcg32_random_t rng = PCG32_INITIALIZER;
+static UA_THREAD_LOCAL pcg32_random_t UA_rng = PCG32_INITIALIZER;
 
 UA_EXPORT void UA_random_seed(UA_UInt64 seed) {
-    pcg32_srandom_r(&rng, seed, UA_DateTime_now());
+    pcg32_srandom_r(&UA_rng, seed, UA_DateTime_now());
 }
 
 UA_EXPORT UA_UInt32 UA_random(void) {
-    return (UA_UInt32)pcg32_random_r(&rng);
+    return (UA_UInt32)pcg32_random_r(&UA_rng);
 }
 
 /*****************/
@@ -255,16 +255,16 @@ UA_Boolean UA_Guid_equal(const UA_Guid *g1, const UA_Guid *g2) {
 
 UA_Guid UA_Guid_random(UA_UInt32 *seed) {
     UA_Guid result;
-    result.data1 = (UA_UInt32)pcg32_random_r(&rng);
-    UA_UInt32 r = (UA_UInt32)pcg32_random_r(&rng);
+    result.data1 = (UA_UInt32)pcg32_random_r(&UA_rng);
+    UA_UInt32 r = (UA_UInt32)pcg32_random_r(&UA_rng);
     result.data2 = (UA_UInt16) r;
     result.data3 = (UA_UInt16) (r >> 16);
-    r = (UA_UInt32)pcg32_random_r(&rng);
+    r = (UA_UInt32)pcg32_random_r(&UA_rng);
     result.data4[0] = (UA_Byte)r;
     result.data4[1] = (UA_Byte)(r >> 4);
     result.data4[2] = (UA_Byte)(r >> 8);
     result.data4[3] = (UA_Byte)(r >> 12);
-    r = (UA_UInt32)pcg32_random_r(&rng);
+    r = (UA_UInt32)pcg32_random_r(&UA_rng);
     result.data4[4] = (UA_Byte)r;
     result.data4[5] = (UA_Byte)(r >> 4);
     result.data4[6] = (UA_Byte)(r >> 8);

+ 0 - 11
tests/check_services_attributes.c

@@ -48,17 +48,6 @@ static UA_Server* makeTestSequence(void) {
                             UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE),
                             obj_attr);
 
-    /* /\* ReferenceTypeNode *\/ */
-    /* UA_ReferenceTypeNode *organizes = UA_ReferenceTypeNode_new(); */
-    /* copyNames((UA_Node*)organizes, "Organizes"); */
-    /* organizes->inverseName = UA_LOCALIZEDTEXT_ALLOC("", "OrganizedBy"); */
-    /* organizes->nodeId.identifier.numeric = UA_NS0ID_ORGANIZES; */
-    /* organizes->isAbstract = UA_FALSE; */
-    /* organizes->symmetric  = UA_FALSE; */
-    /* UA_Server_addNode(server, (UA_Node*)organizes, */
-    /*                       &UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_HIERARCHICALREFERENCES), */
-    /*                       &UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE)); */
-
     /* ViewNode */
     UA_ViewAttributes view_attr;
     UA_ViewAttributes_init(&view_attr);