refactor(examples): Rename _deleteMembers to _clear

open62541 · Apr 15, 2020 · a77b20f · a77b20f
1 parent 27492f8
commit a77b20f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
     }
 
     /* Clean up */
-    UA_Variant_deleteMembers(&value);
+    UA_Variant_clear(&value);
     UA_Client_delete(client); /* Disconnects the client internally */
     return status;
 }

diff --git a/examples/pubsub/server_pubsub_publisher_rt_level.c b/examples/pubsub/server_pubsub_publisher_rt_level.c
@@ -86,7 +86,7 @@ valueUpdateCallback(UA_Server *server, void *data) {
         }
         if(i == 0 && *intValue  > PUBSUB_CONFIG_PUBLISH_CYCLES)
             running = false;
-        UA_Variant_deleteMembers(&value);
+        UA_Variant_clear(&value);
     }
 #endif
 }

diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback.c b/examples/pubsub_realtime/pubsub_TSN_loopback.c
@@ -346,7 +346,7 @@ static void addSubscribedVariables (UA_Server *server, UA_NodeId dataSetReaderId
     targetVars.targetVariables[iterator].targetNodeId = subNodeID;
     UA_Server_DataSetReader_createTargetVariables(server, dataSetReaderId, &targetVars);
 
-    UA_TargetVariablesDataType_deleteMembers(&targetVars);
+    UA_TargetVariablesDataType_clear(&targetVars);
     UA_free(readerConfig.dataSetMetaData.fields);
 }
 #endif
@@ -713,13 +713,13 @@ void *userApplicationPubSub(void *arg) {
         UA_Server_readValue(server, nodeid, &subCounter);
         clock_gettime(CLOCKID, &dataReceiveTime);
         subCounterData = *(UA_UInt64 *)subCounter.data;
-        UA_Variant_deleteMembers(&subCounter);
+        UA_Variant_clear(&subCounter);
         for (UA_Int32 iterator = 0; iterator <  REPEATED_NODECOUNTS; iterator++)
         {
             UA_Variant_init(&subCounter);
             UA_Server_readValue(server, UA_NODEID_NUMERIC(1, (UA_UInt32)iterator+50000), &subCounter);
             *repeatedCounterData[iterator] = *(UA_UInt64 *)subCounter.data;
-            UA_Variant_deleteMembers(&subCounter);
+            UA_Variant_clear(&subCounter);
         }
 #endif
 #if defined(PUBLISHER)
@@ -772,18 +772,18 @@ static void removeServerNodes(UA_Server *server) {
 #ifndef PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS
     /* Delete the Publisher Counter Node*/
     UA_Server_deleteNode(server, pubNodeID, UA_TRUE);
-    UA_NodeId_deleteMembers(&pubNodeID);
+    UA_NodeId_clear(&pubNodeID);
     for (UA_Int32 iterator = 0; iterator < REPEATED_NODECOUNTS; iterator++)
     {
         UA_Server_deleteNode(server, pubRepeatedCountNodeID, UA_TRUE);
-        UA_NodeId_deleteMembers(&pubRepeatedCountNodeID);
+        UA_NodeId_clear(&pubRepeatedCountNodeID);
     }
 #endif
 
     for (UA_Int32 iterator = 0; iterator < REPEATED_NODECOUNTS; iterator++)
     {
         UA_Server_deleteNode(server, subRepeatedCountNodeID, UA_TRUE);
-        UA_NodeId_deleteMembers(&subRepeatedCountNodeID);
+        UA_NodeId_clear(&subRepeatedCountNodeID);
     }
 }
 

diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher.c b/examples/pubsub_realtime/pubsub_TSN_publisher.c
@@ -349,7 +349,7 @@ static void addSubscribedVariables (UA_Server *server, UA_NodeId dataSetReaderId
     targetVars.targetVariables[iterator].targetNodeId = subNodeID;
     UA_Server_DataSetReader_createTargetVariables(server, dataSetReaderId, &targetVars);
 
-    UA_TargetVariablesDataType_deleteMembers(&targetVars);
+    UA_TargetVariablesDataType_clear(&targetVars);
     UA_free(readerConfig.dataSetMetaData.fields);
 }
 
@@ -745,7 +745,7 @@ void *userApplicationPubSub(void *arg) {
         UA_Server_readValue(server, nodeid, &subCounter);
         subCounterData          = *(UA_UInt64 *)subCounter.data;
         clock_gettime(CLOCKID, &dataReceiveTime);
-        UA_Variant_deleteMembers(&subCounter);
+        UA_Variant_clear(&subCounter);
 #if defined(UPDATE_MEASUREMENTS)
         updateMeasurementsPublisher(dataModificationTime, *pubCounterData);
         if (subCounterData > 0)
@@ -777,17 +777,17 @@ static void removeServerNodes(UA_Server *server) {
 #ifndef PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS
     /* Delete the Publisher Counter Node*/
     UA_Server_deleteNode(server, pubNodeID, UA_TRUE);
-    UA_NodeId_deleteMembers(&pubNodeID);
+    UA_NodeId_clear(&pubNodeID);
     for (UA_Int32 iterator = 0; iterator < REPEATED_NODECOUNTS; iterator++)
     {
         UA_Server_deleteNode(server, pubRepeatedCountNodeID, UA_TRUE);
-        UA_NodeId_deleteMembers(&pubRepeatedCountNodeID);
+        UA_NodeId_clear(&pubRepeatedCountNodeID);
     }
 #endif
     for (UA_Int32 iterator = 0; iterator < REPEATED_NODECOUNTS; iterator++)
     {
         UA_Server_deleteNode(server, subRepeatedCountNodeID, UA_TRUE);
-        UA_NodeId_deleteMembers(&subRepeatedCountNodeID);
+        UA_NodeId_clear(&subRepeatedCountNodeID);
     }
 }