Browse Source

improve the wording

Julius Pfrommer 9 years ago
parent
commit
4043ec2ca1
3 changed files with 4 additions and 4 deletions
  1. 2 2
      examples/networklayer_tcp.c
  2. 1 1
      include/ua_server.h
  3. 1 1
      src/server/ua_server.c

+ 2 - 2
examples/networklayer_tcp.c

@@ -461,7 +461,7 @@ static UA_Int32 ServerNetworkLayerTCP_stop(UA_ServerNetworkLayer *nl, UA_Job **j
 }
 
 /* run only when the server is stopped */
-static void ServerNetworkLayerTCP_delete(UA_ServerNetworkLayer *nl) {
+static void ServerNetworkLayerTCP_deleteMembers(UA_ServerNetworkLayer *nl) {
     ServerNetworkLayerTCP *layer = nl->handle;
     removeMappings(layer, layer->deletes);
     freeConnections(NULL, layer->deletes);
@@ -505,7 +505,7 @@ UA_ServerNetworkLayer ServerNetworkLayerTCP_new(UA_ConnectionConfig conf, UA_UIn
     nl.start = ServerNetworkLayerTCP_start;
     nl.getJobs = ServerNetworkLayerTCP_getJobs;
     nl.stop = ServerNetworkLayerTCP_stop;
-    nl.free = ServerNetworkLayerTCP_delete;
+    nl.deleteMembers = ServerNetworkLayerTCP_deleteMembers;
     return nl;
 }
 

+ 1 - 1
include/ua_server.h

@@ -249,7 +249,7 @@ typedef struct UA_ServerNetworkLayer {
     UA_Int32 (*stop)(struct UA_ServerNetworkLayer *nl, UA_Job **jobs);
 
     /** Deletes the network layer. Call only after a successful shutdown. */
-    void (*free)(struct UA_ServerNetworkLayer *nl);
+    void (*deleteMembers)(struct UA_ServerNetworkLayer *nl);
 } UA_ServerNetworkLayer;
 
 /**

+ 1 - 1
src/server/ua_server.c

@@ -154,7 +154,7 @@ void UA_Server_delete(UA_Server *server) {
     // Delete the network layers
     for(size_t i = 0; i < server->networkLayersSize; i++) {
         UA_String_deleteMembers(&server->networkLayers[i].discoveryUrl);
-        server->networkLayers[i].free(&server->networkLayers[i]);
+        server->networkLayers[i].deleteMembers(&server->networkLayers[i]);
     }
     UA_free(server->networkLayers);