initialize types after deleteMembers; clean up type handling

open62541 · Aug 20, 2016 · 1cc0127 · 1cc0127
1 parent 04f84eb
commit 1cc0127
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 109 deletions.
diff --git a/include/ua_types.h b/include/ua_types.h
@@ -45,8 +45,8 @@ extern "C" {
  *   Copy the content of the data type. Returns ``UA_STATUSCODE_GOOD`` or
  *   ``UA_STATUSCODE_BADOUTOFMEMORY``.
  * ``void T_deleteMembers(T *ptr)``
- *   Delete the dynamically allocated content of the data type, but not the data
- *   type itself.
+ *   Delete the dynamically allocated content of the data type and perform a
+ *   ``T_init`` to reset the type.
  * ``void T_delete(T *ptr)``
  *   Delete the content of the data type and the memory for the data type itself.
  *

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
@@ -246,7 +246,7 @@ __UA_Server_addNode(UA_Server *server, const UA_NodeClass nodeClass,
     if(outNewNodeId && result.statusCode == UA_STATUSCODE_GOOD)
         *outNewNodeId = result.addedNodeId;
     else
-        UA_AddNodesResult_deleteMembers(&result);
+        UA_NodeId_deleteMembers(&result.addedNodeId);
     return result.statusCode;
 }