Explorar o código

refactor(core): Rename deleteMembers to clear in UA_AccessControl

Julius Pfrommer %!s(int64=5) %!d(string=hai) anos
pai
achega
afe1f3d98e

+ 1 - 1
examples/access_control/server_access_control.c

@@ -61,7 +61,7 @@ int main(void) {
     UA_ServerConfig_setDefault(config);
 
     /* Disable anonymous logins, enable two user/password logins */
-    config->accessControl.deleteMembers(&config->accessControl);
+    config->accessControl.clear(&config->accessControl);
     UA_StatusCode retval = UA_AccessControl_default(config, false,
              &config->securityPolicies[config->securityPoliciesSize-1].policyUri, 2, logins);
     if(retval != UA_STATUSCODE_GOOD)

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

@@ -26,7 +26,7 @@ typedef struct UA_AccessControl UA_AccessControl;
 
 struct UA_AccessControl {
     void *context;
-    void (*deleteMembers)(UA_AccessControl *ac);
+    void (*clear)(UA_AccessControl *ac);
 
     /* Supported login mechanisms. The server endpoints are created from here. */
     size_t userTokenPoliciesSize;

+ 2 - 2
plugins/ua_accesscontrol_default.c

@@ -193,7 +193,7 @@ allowHistoryUpdateDeleteRawModified_default(UA_Server *server, UA_AccessControl
 /* Create Delete Access Control Plugin */
 /***************************************/
 
-static void deleteMembers_default(UA_AccessControl *ac) {
+static void clear_default(UA_AccessControl *ac) {
     UA_Array_delete((void*)(uintptr_t)ac->userTokenPolicies,
                     ac->userTokenPoliciesSize,
                     &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
@@ -219,7 +219,7 @@ UA_AccessControl_default(UA_ServerConfig *config, UA_Boolean allowAnonymous,
                          size_t usernamePasswordLoginSize,
                          const UA_UsernamePasswordLogin *usernamePasswordLogin) {
     UA_AccessControl *ac = &config->accessControl;
-    ac->deleteMembers = deleteMembers_default;
+    ac->clear = clear_default;
     ac->activateSession = activateSession_default;
     ac->closeSession = closeSession_default;
     ac->getUserRightsMask = getUserRightsMask_default;

+ 2 - 2
src/server/ua_server_config.c

@@ -52,8 +52,8 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
         config->certificateVerification.deleteMembers(&config->certificateVerification);
 
     /* Access Control */
-    if(config->accessControl.deleteMembers)
-        config->accessControl.deleteMembers(&config->accessControl);
+    if(config->accessControl.clear)
+        config->accessControl.clear(&config->accessControl);
 
     /* Historical data */
 #ifdef UA_ENABLE_HISTORIZING