Stasik0 il y a 10 ans
Parent
commit
f082aa02ff
3 fichiers modifiés avec 4 ajouts et 5 suppressions
  1. 1 1
      examples/client_stateless.c
  2. 2 2
      src/server/ua_server.c
  3. 1 2
      src/server/ua_services_attribute.c

+ 1 - 1
examples/client_stateless.c

@@ -72,7 +72,7 @@ int main(int argc , char *argv[])
 	req.requestHeader.additionalHeader = reqHeaderAdditionalHeader;
 	UA_ExtensionObject_init(&(req.requestHeader.additionalHeader));
 
-	UA_Array_new((void **)&req.nodesToRead, 1, &UA_TYPES[UA_TYPES_READVALUEID]);
+	req.nodesToRead= UA_Array_new(&UA_TYPES[UA_TYPES_READVALUEID], 1);
 	req.nodesToReadSize = 1;
 
 	UA_ReadValueId_init(&(req.nodesToRead[0]));

+ 2 - 2
src/server/ua_server.c

@@ -462,7 +462,7 @@ UA_Server * UA_Server_new(void) {
     namespaceArray->historizing = UA_FALSE;
     UA_Server_addNode(server, (UA_Node*)namespaceArray,
                       &UA_EXPANDEDNODEID_STATIC(0, UA_NS0ID_SERVER),
-                      &UA_NODEID_STATIC(0, UA_NS0ID_HASCOMPONENT));
+                      &UA_NODEID_STATIC(0, UA_NS0ID_HASPROPERTY));
 
     UA_ServerStatusDataType *status = UA_ServerStatusDataType_new();
     status->startTime   = UA_DateTime_now();
@@ -485,7 +485,7 @@ UA_Server * UA_Server_new(void) {
     serverstatus->value.storage.data.dataPtr = status;
     UA_Server_addNode(server, (UA_Node*)serverstatus,
                       &UA_EXPANDEDNODEID_STATIC(0, UA_NS0ID_SERVER),
-                      &UA_NODEID_STATIC(0, UA_NS0ID_HASPROPERTY));
+                      &UA_NODEID_STATIC(0, UA_NS0ID_HASCOMPONENT));
 
     // todo: make this variable point to a member of the serverstatus
     UA_VariableNode *state = UA_VariableNode_new();

+ 1 - 2
src/server/ua_services_attribute.c

@@ -255,8 +255,7 @@ void Service_Read(UA_Server *server, UA_Session *session, const UA_ReadRequest *
 		variant.storage.data.arrayLength = request->nodesToReadSize;
 
 		UA_DateTime* expireArray = UA_NULL;
-		UA_Array_new((void**)&expireArray, request->nodesToReadSize,
-												&UA_TYPES[UA_TYPES_DATETIME]);
+		expireArray = UA_Array_new(&UA_TYPES[UA_TYPES_DATETIME], request->nodesToReadSize);
 		variant.storage.data.dataPtr = expireArray;
 
 		UA_ByteString str;