浏览代码

refactor(core): Rename deleteMembers to clear in UA_ServerNetworkLayer

Julius Pfrommer 5 年之前
父节点
当前提交
e347222a88
共有 4 个文件被更改,包括 5 次插入5 次删除
  1. 1 1
      arch/network_tcp.c
  2. 2 2
      arch/network_ws.c
  3. 1 1
      include/open62541/plugin/network.h
  4. 1 1
      src/server/ua_server_config.c

+ 1 - 1
arch/network_tcp.c

@@ -546,7 +546,7 @@ UA_ServerNetworkLayerTCP(UA_ConnectionConfig config, UA_UInt16 port,
                          UA_Logger *logger) {
     UA_ServerNetworkLayer nl;
     memset(&nl, 0, sizeof(UA_ServerNetworkLayer));
-    nl.deleteMembers = ServerNetworkLayerTCP_deleteMembers;
+    nl.clear = ServerNetworkLayerTCP_deleteMembers;
     nl.localConnectionConfig = config;
     nl.start = ServerNetworkLayerTCP_start;
     nl.listen = ServerNetworkLayerTCP_listen;

+ 2 - 2
arch/network_ws.c

@@ -282,7 +282,7 @@ ServerNetworkLayerWS_stop(UA_ServerNetworkLayer *nl, UA_Server *server) {
 }
 
 static void
-ServerNetworkLayerWS_deleteMembers(UA_ServerNetworkLayer *nl) {
+ServerNetworkLayerWS_clear(UA_ServerNetworkLayer *nl) {
     UA_free(nl->handle);
     UA_String_deleteMembers(&nl->discoveryUrl);
 }
@@ -291,7 +291,7 @@ UA_ServerNetworkLayer
 UA_ServerNetworkLayerWS(UA_ConnectionConfig config, UA_UInt16 port, UA_Logger *logger) {
     UA_ServerNetworkLayer nl;
     memset(&nl, 0, sizeof(UA_ServerNetworkLayer));
-    nl.deleteMembers = ServerNetworkLayerWS_deleteMembers;
+    nl.clear = ServerNetworkLayerWS_clear;
     nl.localConnectionConfig = config;
     nl.start = ServerNetworkLayerWS_start;
     nl.listen = ServerNetworkLayerWS_listen;

+ 1 - 1
include/open62541/plugin/network.h

@@ -184,7 +184,7 @@ struct UA_ServerNetworkLayer {
     void (*stop)(UA_ServerNetworkLayer *nl, UA_Server *server);
 
     /* Deletes the network layer context. Call only after stopping. */
-    void (*deleteMembers)(UA_ServerNetworkLayer *nl);
+    void (*clear)(UA_ServerNetworkLayer *nl);
 };
 
 /**

+ 1 - 1
src/server/ua_server_config.c

@@ -25,7 +25,7 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
 
     /* Networking */
     for(size_t i = 0; i < config->networkLayersSize; ++i)
-        config->networkLayers[i].deleteMembers(&config->networkLayers[i]);
+        config->networkLayers[i].clear(&config->networkLayers[i]);
     UA_free(config->networkLayers);
     config->networkLayers = NULL;
     config->networkLayersSize = 0;