Sfoglia il codice sorgente

Fix static initialization for TinyCC

Stefan Profanter 7 anni fa
parent
commit
b22c14dbaf
1 ha cambiato i file con 15 aggiunte e 18 eliminazioni
  1. 15 18
      tests/server/check_server_userspace.c

+ 15 - 18
tests/server/check_server_userspace.c

@@ -107,24 +107,21 @@ START_TEST(Server_forEachChildNodeCall) {
 
     /* List all the children/references of the objects folder
      * The forEachChildNodeCall has to hit all of them */
-    struct nodeIterData objectsFolderChildren[] = {
-        {
-                UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER),
-                UA_FALSE,
-                UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
-                UA_FALSE
-        },{
-                UA_NODEID_NUMERIC(0, UA_NS0ID_ROOTFOLDER),
-                UA_TRUE,
-                UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
-                UA_FALSE
-        },{
-                UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE),
-                UA_FALSE,
-                UA_NODEID_NUMERIC(0, UA_NS0ID_HASTYPEDEFINITION),
-                UA_FALSE
-        }
-    };
+    struct nodeIterData objectsFolderChildren[3];
+    objectsFolderChildren[0].id = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER);
+    objectsFolderChildren[0].isInverse = UA_FALSE;
+    objectsFolderChildren[0].referenceTypeID = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+    objectsFolderChildren[0].hit = UA_FALSE;
+
+    objectsFolderChildren[1].id = UA_NODEID_NUMERIC(0, UA_NS0ID_ROOTFOLDER);
+    objectsFolderChildren[1].isInverse = UA_TRUE;
+    objectsFolderChildren[1].referenceTypeID = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+    objectsFolderChildren[1].hit = UA_FALSE;
+
+    objectsFolderChildren[2].id = UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE);
+    objectsFolderChildren[2].isInverse = UA_FALSE;
+    objectsFolderChildren[2].referenceTypeID = UA_NODEID_NUMERIC(0, UA_NS0ID_HASTYPEDEFINITION);
+    objectsFolderChildren[2].hit = UA_FALSE;
 
     UA_StatusCode retval = UA_Server_forEachChildNodeCall(server, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), nodeIter, &objectsFolderChildren);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);