|
@@ -17,6 +17,10 @@ static UA_StatusCode
|
|
|
deleteReference(UA_Server *server, UA_Session *session,
|
|
|
const UA_DeleteReferencesItem *item);
|
|
|
|
|
|
+static UA_StatusCode
|
|
|
+deleteNode(UA_Server *server, UA_Session *session,
|
|
|
+ const UA_NodeId *nodeId, UA_Boolean deleteReferences);
|
|
|
+
|
|
|
/**********************/
|
|
|
/* Consistency Checks */
|
|
|
/**********************/
|
|
@@ -551,7 +555,7 @@ Service_AddNodes_existing(UA_Server *server, UA_Session *session, UA_Node *node,
|
|
|
return UA_STATUSCODE_GOOD;
|
|
|
|
|
|
remove_node:
|
|
|
- Service_DeleteNodes_single(server, &adminSession, &node->nodeId, true);
|
|
|
+ deleteNode(server, &adminSession, &node->nodeId, true);
|
|
|
return retval;
|
|
|
}
|
|
|
|
|
@@ -1247,9 +1251,9 @@ removeReferences(UA_Server *server, UA_Session *session, const UA_Node *node) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-UA_StatusCode
|
|
|
-Service_DeleteNodes_single(UA_Server *server, UA_Session *session,
|
|
|
- const UA_NodeId *nodeId, UA_Boolean deleteReferences) {
|
|
|
+static UA_StatusCode
|
|
|
+deleteNode(UA_Server *server, UA_Session *session,
|
|
|
+ const UA_NodeId *nodeId, UA_Boolean deleteReferences) {
|
|
|
const UA_Node *node = UA_NodeStore_get(server->nodestore, nodeId);
|
|
|
if(!node)
|
|
|
return UA_STATUSCODE_BADNODEIDUNKNOWN;
|
|
@@ -1292,8 +1296,8 @@ void Service_DeleteNodes(UA_Server *server, UA_Session *session,
|
|
|
|
|
|
for(size_t i = 0; i < request->nodesToDeleteSize; ++i) {
|
|
|
UA_DeleteNodesItem *item = &request->nodesToDelete[i];
|
|
|
- response->results[i] = Service_DeleteNodes_single(server, session, &item->nodeId,
|
|
|
- item->deleteTargetReferences);
|
|
|
+ response->results[i] = deleteNode(server, session, &item->nodeId,
|
|
|
+ item->deleteTargetReferences);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1301,8 +1305,8 @@ UA_StatusCode
|
|
|
UA_Server_deleteNode(UA_Server *server, const UA_NodeId nodeId,
|
|
|
UA_Boolean deleteReferences) {
|
|
|
UA_RCU_LOCK();
|
|
|
- UA_StatusCode retval = Service_DeleteNodes_single(server, &adminSession,
|
|
|
- &nodeId, deleteReferences);
|
|
|
+ UA_StatusCode retval = deleteNode(server, &adminSession,
|
|
|
+ &nodeId, deleteReferences);
|
|
|
UA_RCU_UNLOCK();
|
|
|
return retval;
|
|
|
}
|