Forráskód Böngészése

Use the less noisy C99 true/false throughout. But keep the UA_TRUE/UA_FALSE macros for compatibility

Julius Pfrommer 9 éve
szülő
commit
34dafb78ce
46 módosított fájl, 393 hozzáadás és 398 törlés
  1. 2 2
      README.md
  2. 7 7
      doc/tutorial_noderelations.rst
  3. 1 1
      doc/tutorial_nodes.rst
  4. 4 4
      doc/tutorial_nodescontents.rst
  5. 4 4
      doc/tutorial_server_firstSteps.rst
  6. 1 1
      examples/client.c
  7. 3 4
      examples/client_firstSteps.c
  8. 10 10
      examples/server.c
  9. 2 2
      examples/server.cpp
  10. 2 2
      examples/server_datasource.c
  11. 2 2
      examples/server_firstSteps.c
  12. 2 2
      examples/server_nodeset.c
  13. 2 2
      examples/server_readspeed.c
  14. 2 2
      examples/server_repeated_job.c
  15. 5 8
      examples/server_variable.c
  16. 1 1
      include/ua_types.h
  17. 12 13
      src/client/ua_client.c
  18. 9 9
      src/client/ua_client_highlevel_subscriptions.c
  19. 7 7
      src/server/ua_nodestore.c
  20. 1 1
      src/server/ua_nodestore_concurrent.c
  21. 1 1
      src/server/ua_nodestore_hash.inc
  22. 94 94
      src/server/ua_server.c
  23. 4 4
      src/server/ua_server_binary.c
  24. 4 4
      src/server/ua_server_worker.c
  25. 16 16
      src/server/ua_services_attribute.c
  26. 2 2
      src/server/ua_services_call.c
  27. 5 5
      src/server/ua_services_discovery.c
  28. 17 17
      src/server/ua_services_nodemanagement.c
  29. 2 2
      src/server/ua_services_session.c
  30. 7 7
      src/server/ua_services_subscription.c
  31. 16 16
      src/server/ua_services_view.c
  32. 27 27
      src/server/ua_subscription.c
  33. 5 5
      src/ua_connection.c
  34. 1 1
      src/ua_session.c
  35. 13 13
      src/ua_types.c
  36. 2 2
      src/ua_types_encoding_binary.c
  37. 2 2
      src/ua_util.h
  38. 1 1
      src_extra/networklayer_tcp.c
  39. 8 8
      tests/check_builtin.c
  40. 1 1
      tests/check_memory.c
  41. 37 37
      tests/check_services_attributes.c
  42. 1 1
      tests/check_session.c
  43. 23 23
      tools/generate_datatypes.py
  44. 4 4
      tools/pyUANamespace/open62541_MacroHelper.py
  45. 3 3
      tools/pyUANamespace/ua_builtin_types.py
  46. 18 18
      tools/pyUANamespace/ua_node_types.py

+ 2 - 2
README.md

@@ -38,9 +38,9 @@ With the GCC compiler, just run ```gcc -std=c99 <server.c> open62541.c -o server
 
 #define PORT 16664
 
-UA_Boolean running = UA_TRUE;
+UA_Boolean running = true;
 void signalHandler(int sig) {
-    running = UA_FALSE;
+    running = false;
 }
 
 int main(int argc, char** argv)

+ 7 - 7
doc/tutorial_noderelations.rst

@@ -347,7 +347,7 @@ Defining an object type is only usefull if it ends up making our lives easier in
 
       UA_Server *server = UA_Server_new(UA_ServerConfig_standard);
       UA_Server_addNetworkLayer(server, ServerNetworkLayerTCP_new(UA_ConnectionConfig_standard, 16664));
-      running = UA_TRUE;
+      running = true;
 
       UA_Int32 myHandle = 42;
       UA_Server_addInstanceOf(server, UA_NODEID_NUMERIC(1, 0),
@@ -445,7 +445,7 @@ Since searching in nodes is a common operation, the high-level branch provides a
         UA_NodeId PumpId;
       } *nodeIterParam = handle;
       
-      if (isInverse == UA_TRUE)
+      if (isInverse == true)
         return UA_STATUSCODE_GOOD;
       if (childId.namespaceIndex != 1)
         return UA_STATUSCODE_GOOD;
@@ -460,7 +460,7 @@ Since searching in nodes is a common operation, the high-level branch provides a
         if (childBrowseName->namespaceIndex == 1) {
           if (!strncmp(childBrowseName->name.data, pumpName.data, pumpName.length))
             printf("Found %s with NodeId ns=1,i=%d\n", childBrowseName->name.data, childId.identifier.numeric);
-            inodeIterParam->isAPump = UA_TRUE;
+            inodeIterParam->isAPump = true;
             UA_NodeId_copy(&childId, &nodeIterParam->PumpId);
         }
       }
@@ -483,10 +483,10 @@ Since searching in nodes is a common operation, the high-level branch provides a
         UA_NodeId PumpId;
       } nodeIterParam;
       nodeIterParam.client = client;
-      nodeIterParam.isAPump = UA_FALSE;
+      nodeIterParam.isAPump = false;
       
       UA_Client_forEachChildNodeCall(client, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), nodeIter, (void *) &nodeIterParam);
-      if (nodeIterParam.isAPump == UA_TRUE)
+      if (nodeIterParam.isAPump == true)
         printf("Found at least one pump\n");
         
       UA_Client_disconnect(client);
@@ -537,10 +537,10 @@ Let's suppose we wanted to do something elaborate with our pump instance that wa
         UA_NodeId PumpId;
       } nodeIterParam;
       nodeIterParam.client = client;
-      nodeIterParam.isAPump = UA_FALSE;
+      nodeIterParam.isAPump = false;
       
       UA_Client_forEachChildNodeCall(client, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), nodeIter, (void *) &nodeIterParam);
-      if (nodeIterParam.isAPump == UA_TRUE) {
+      if (nodeIterParam.isAPump == true) {
         UA_ObjectNode *aPump;
         UA_Client_getNodeCopy(client, nodeIterParam.PumpId, (void **) &aPump);
         printf("The pump %s with NodeId ns=1,i=%d was returned\n", aPump->browseName.name.data, aPump->nodeId.identifier.numeric);

+ 1 - 1
doc/tutorial_nodes.rst

@@ -86,7 +86,7 @@ Let us modify our current server to create a new object node (a folder) that wil
       
       UA_Server *server = UA_Server_new(UA_ServerConfig_standard);
       UA_Server_addNetworkLayer(server, ServerNetworkLayerTCP_new(UA_ConnectionConfig_standard, 16664));
-      running = UA_TRUE;
+      running = true;
       
       UA_NodeId myObjectsId;
       UA_StatusCode retval = UA_Server_addObjectNode( 

+ 4 - 4
doc/tutorial_nodescontents.rst

@@ -86,7 +86,7 @@ Let us use one of some of these functions to slightly alter the Objects node to
       
       UA_Server *server = UA_Server_new(UA_ServerConfig_standard);
       UA_Server_addNetworkLayer(server, ServerNetworkLayerTCP_new(UA_ConnectionConfig_standard, 16664));
-      running = UA_TRUE;
+      running = true;
       
       UA_LocalizedText objectsLocale = UA_LOCALIZEDTEXT("de_DE","Objekkkte");
       UA_Server_setAttributeValue(server, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), UA_ATTRIBUTEID_DISPLAYNAME, (void *) &objectsLocale);
@@ -153,7 +153,7 @@ We will first create a new variable on the server side during startup to introdu
 
       UA_Server *server = UA_Server_new(UA_ServerConfig_standard);
       UA_Server_addNetworkLayer(server, ServerNetworkLayerTCP_new(UA_ConnectionConfig_standard, 16664));
-      running = UA_TRUE;
+      running = true;
 
       // Create a Int32 as value
       UA_Variant *myValueVariant = UA_Variant_new();
@@ -228,7 +228,7 @@ Let's turn myVar into an access counter.::
 
     static UA_StatusCode readMyVar(void *handle, UA_Boolean sourceTimeStamp, const UA_NumericRange *range, UA_DataValue *value) {
       global_accessCounter++;
-      value->hasValue = UA_TRUE;
+      value->hasValue = true;
       UA_Variant_setScalarCopy(&value->value, &global_accessCounter, &UA_TYPES[UA_TYPES_INT32]);
       return UA_STATUSCODE_GOOD;
     }
@@ -239,7 +239,7 @@ Let's turn myVar into an access counter.::
 
       UA_Server *server = UA_Server_new(UA_ServerConfig_standard);
       UA_Server_addNetworkLayer(server, ServerNetworkLayerTCP_new(UA_ConnectionConfig_standard, 16664));
-      running = UA_TRUE;
+      running = true;
       
       UA_DataSource myDataSource = (UA_DataSource) {.handle = NULL, .read = readMyVar, .write = NULL};
       UA_Server_addDataSourceVariableNode(server, myDataSource, UA_QUALIFIEDNAME(1, "MyVar"), UA_NODEID_NUMERIC(1,12345),

+ 4 - 4
doc/tutorial_server_firstSteps.rst

@@ -150,7 +150,7 @@ Open myServer.c and write/paste your minimal server application:
      config.networkLayers = &nl;
      config.networkLayersSize = 1;
      UA_Server *server = UA_Server_new(config);
-     running = UA_TRUE;
+     running = true;
      UA_Server_run(server, &running);
      UA_Server_delete(server);
 
@@ -181,9 +181,9 @@ We will also make a slight change to our server: We want it to exit cleanly when
     #include "logger_stdout.h"
     #include "networklayer_tcp.h"
 
-    UA_Boolean running = UA_TRUE;
+    UA_Boolean running = true;
     static void stopHandler(int signal) {
-        running = UA_FALSE;
+        running = false;
     }
     
     int main(void) {
@@ -286,7 +286,7 @@ Open myServer.c and simplify it to:
      config.networkLayers = &nl;
      config.networkLayersSize = 1;
      UA_Server *server = UA_Server_new(config);
-     running = UA_TRUE;
+     running = true;
      UA_Server_run(server, &running);
      UA_Server_delete(server);
 

+ 1 - 1
examples/client.c

@@ -138,7 +138,7 @@ int main(int argc, char *argv[]) {
     wReq.nodesToWriteSize = 1;
     wReq.nodesToWrite[0].nodeId = UA_NODEID_STRING_ALLOC(1, "the.answer"); /* assume this node exists */
     wReq.nodesToWrite[0].attributeId = UA_ATTRIBUTEID_VALUE;
-    wReq.nodesToWrite[0].value.hasValue = UA_TRUE;
+    wReq.nodesToWrite[0].value.hasValue = true;
     wReq.nodesToWrite[0].value.value.type = &UA_TYPES[UA_TYPES_INT32];
     wReq.nodesToWrite[0].value.value.storageType = UA_VARIANT_DATA_NODELETE; //do not free the integer on deletion
     wReq.nodesToWrite[0].value.value.data = &value;

+ 3 - 4
examples/client_firstSteps.c

@@ -33,10 +33,9 @@ int main(void) {
     rReq.nodesToRead[0].attributeId = UA_ATTRIBUTEID_VALUE;
 
     UA_ReadResponse rResp = UA_Client_Service_read(client, rReq);
-    if(rResp.responseHeader.serviceResult == UA_STATUSCODE_GOOD &&
-            rResp.resultsSize > 0 && rResp.results[0].hasValue &&
-            UA_Variant_isScalar(&rResp.results[0].value) &&
-            rResp.results[0].value.type == &UA_TYPES[UA_TYPES_DATETIME]) {
+    if(rResp.responseHeader.serviceResult == UA_STATUSCODE_GOOD && rResp.resultsSize > 0 &&
+       rResp.results[0].hasValue && UA_Variant_isScalar(&rResp.results[0].value) &&
+       rResp.results[0].value.type == &UA_TYPES[UA_TYPES_DATETIME]) {
         raw_date = *(UA_DateTime*)rResp.results[0].value.data;
         printf("raw date is: %" PRId64 "\n", raw_date);
         string_date = UA_DateTime_toString(raw_date);

+ 10 - 10
examples/server.c

@@ -50,15 +50,15 @@ static UA_StatusCode
 readTimeData(void *handle, const UA_NodeId nodeId, UA_Boolean sourceTimeStamp,
              const UA_NumericRange *range, UA_DataValue *value) {
     if(range) {
-        value->hasStatus = UA_TRUE;
+        value->hasStatus = true;
         value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
         return UA_STATUSCODE_GOOD;
     }
 	UA_DateTime currentTime = UA_DateTime_now();
     UA_Variant_setScalarCopy(&value->value, &currentTime, &UA_TYPES[UA_TYPES_DATETIME]);
-	value->hasValue = UA_TRUE;
+	value->hasValue = true;
 	if(sourceTimeStamp) {
-		value->hasSourceTimestamp = UA_TRUE;
+		value->hasSourceTimestamp = true;
 		value->sourceTimestamp = currentTime;
 	}
 	return UA_STATUSCODE_GOOD;
@@ -73,7 +73,7 @@ static UA_StatusCode
 readTemperature(void *handle, const UA_NodeId nodeId, UA_Boolean sourceTimeStamp,
                 const UA_NumericRange *range, UA_DataValue *value) {
     if(range) {
-        value->hasStatus = UA_TRUE;
+        value->hasStatus = true;
         value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
         return UA_STATUSCODE_GOOD;
     }
@@ -90,9 +90,9 @@ readTemperature(void *handle, const UA_NodeId nodeId, UA_Boolean sourceTimeStamp
 	currentTemperature /= 1000.0;
 
 	value->sourceTimestamp = UA_DateTime_now();
-	value->hasSourceTimestamp = UA_TRUE;
+	value->hasSourceTimestamp = true;
     UA_Variant_setScalarCopy(&value->value, &currentTemperature, &UA_TYPES[UA_TYPES_DOUBLE]);
-	value->hasValue = UA_TRUE;
+	value->hasValue = true;
 	return UA_STATUSCODE_GOOD;
 }
 
@@ -112,7 +112,7 @@ readLedStatus(void *handle, UA_NodeId nodeid, UA_Boolean sourceTimeStamp,
     if(range)
         return UA_STATUSCODE_BADINDEXRANGEINVALID;
 
-    value->hasValue = UA_TRUE;
+    value->hasValue = true;
     UA_StatusCode retval = UA_Variant_setScalarCopy(&value->value, &ledStatus,
                                                     &UA_TYPES[UA_TYPES_BOOLEAN]);
 
@@ -121,7 +121,7 @@ readLedStatus(void *handle, UA_NodeId nodeid, UA_Boolean sourceTimeStamp,
   
     if(sourceTimeStamp) {
         value->sourceTimestamp = UA_DateTime_now();
-        value->hasSourceTimestamp = UA_TRUE;
+        value->hasSourceTimestamp = true;
     }
     return UA_STATUSCODE_GOOD;
 }
@@ -408,8 +408,8 @@ int main(int argc, char** argv) {
     UA_MethodAttributes_init(&addmethodattributes);
     addmethodattributes.description = UA_LOCALIZEDTEXT("en_US", "Return a single argument as passed by the caller");
     addmethodattributes.displayName = UA_LOCALIZEDTEXT("en_US", "ping");
-    addmethodattributes.executable = UA_TRUE;
-    addmethodattributes.userExecutable = UA_TRUE;
+    addmethodattributes.executable = true;
+    addmethodattributes.userExecutable = true;
     UA_Server_addMethodNode(server, UA_NODEID_NUMERIC(1,62541),
                             UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
                             UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),

+ 2 - 2
examples/server.cpp

@@ -23,12 +23,12 @@
 
 using namespace std;
 
-UA_Boolean running = UA_TRUE;
+UA_Boolean running = true;
 UA_Logger logger = Logger_Stdout;
 
 static void stopHandler(int sign) {
     UA_LOG_INFO(logger, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = 0;
+    running = false;
 }
 
 int main() {

+ 2 - 2
examples/server_datasource.c

@@ -15,7 +15,7 @@
 # include "open62541.h"
 #endif
 
-UA_Boolean running = UA_TRUE;
+UA_Boolean running = true;
 UA_Logger logger = Logger_Stdout;
 
 static void stopHandler(int sign) {
@@ -26,7 +26,7 @@ static void stopHandler(int sign) {
 static UA_StatusCode
 readInteger(void *handle, const UA_NodeId nodeid, UA_Boolean sourceTimeStamp,
             const UA_NumericRange *range, UA_DataValue *dataValue) {
-    dataValue->hasValue = UA_TRUE;
+    dataValue->hasValue = true;
     UA_Variant_setScalarCopy(&dataValue->value, (UA_UInt32*)handle, &UA_TYPES[UA_TYPES_INT32]);
     // we know the nodeid is a string
     UA_LOG_INFO(logger, UA_LOGCATEGORY_USERLAND, "Node read %.*s",

+ 2 - 2
examples/server_firstSteps.c

@@ -13,9 +13,9 @@
 # include "open62541.h"
 #endif
 
-UA_Boolean running = UA_TRUE;
+UA_Boolean running = true;
 static void stopHandler(int sig) {
-    running = UA_FALSE;
+    running = false;
 }
 
 int main(void) {

+ 2 - 2
examples/server_nodeset.c

@@ -19,11 +19,11 @@
 #include "nodeset.h"
 
 UA_Logger logger = Logger_Stdout;
-UA_Boolean running = UA_TRUE;
+UA_Boolean running = true;
 
 static void stopHandler(int sign) {
     UA_LOG_INFO(logger, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = UA_FALSE;
+    running = false;
 }
 
 int main(int argc, char** argv) {

+ 2 - 2
examples/server_readspeed.c

@@ -20,12 +20,12 @@
 #include "server/ua_services.h"
 #include "ua_types_encoding_binary.h"
 
-UA_Boolean running = 1;
+UA_Boolean running = true;
 UA_Logger logger = Logger_Stdout;
 
 static void stopHandler(int sign) {
     UA_LOG_INFO(logger, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = 0;
+    running = false;
 }
 
 int main(int argc, char** argv) {

+ 2 - 2
examples/server_repeated_job.c

@@ -14,12 +14,12 @@
 # include "open62541.h"
 #endif
 
-UA_Boolean running = 1;
+UA_Boolean running = true;
 UA_Logger logger = Logger_Stdout;
 
 static void stopHandler(int sign) {
     UA_LOG_INFO(logger, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = 0;
+    running = false;
 }
 
 static void testCallback(UA_Server *server, void *data) {

+ 5 - 8
examples/server_variable.c

@@ -14,22 +14,19 @@
 # include "open62541.h"
 #endif
 
-UA_Boolean running = UA_TRUE;
+UA_Boolean running = true;
 UA_Logger logger = Logger_Stdout;
 
 static void stopHandler(int sign) {
     UA_LOG_INFO(logger, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = 0;
+    running = false;
 }
 
-static void onRead(void *handle, const UA_NodeId nodeid, const UA_Variant *data,
-                   const UA_NumericRange *range) {
-    UA_LOG_INFO(logger, UA_LOGCATEGORY_USERLAND,
-                "onRead; handle is: %i", (uintptr_t)handle);
+static void onRead(void *handle, const UA_NodeId nodeid, const UA_Variant *data, const UA_NumericRange *range) {
+    UA_LOG_INFO(logger, UA_LOGCATEGORY_USERLAND, "onRead; handle is: %i", (uintptr_t)handle);
 }
 
-static void onWrite(void *h, const UA_NodeId nodeid, const UA_Variant *data,
-                    const UA_NumericRange *range) {
+static void onWrite(void *h, const UA_NodeId nodeid, const UA_Variant *data, const UA_NumericRange *range) {
     UA_LOG_INFO(logger, UA_LOGCATEGORY_USERLAND, "onWrite; handle: %i", (uintptr_t)h);
 }
 

+ 1 - 1
include/ua_types.h

@@ -28,7 +28,7 @@ extern "C" {
 #include "ua_config.h"
 #include "ua_statuscodes.h"
 
-/* Indicates that an array has the length 0 (NULL indicates an non-defined array of length -1)*/
+/* Indicates that an array has the length 0 (NULL indicates an non-defined array of length -1) */
 #define UA_EMPTY_ARRAY_SENTINEL ((void*)0x01)
 
 /****************************/

+ 12 - 13
src/client/ua_client.c

@@ -18,8 +18,7 @@ const UA_EXPORT UA_ClientConfig UA_ClientConfig_standard =
 /* Create and Delete */
 /*********************/
 
-static void UA_Client_init(UA_Client* client, UA_ClientConfig config,
-                           UA_Logger logger) {
+static void UA_Client_init(UA_Client* client, UA_ClientConfig config, UA_Logger logger) {
     client->state = UA_CLIENTSTATE_READY;
     UA_Connection_init(&client->connection);
     UA_SecureChannel_init(&client->channel);
@@ -132,7 +131,7 @@ static UA_StatusCode HelAckHandshake(UA_Client *c) {
 
     UA_ByteString reply;
     UA_ByteString_init(&reply);
-    UA_Boolean realloced = UA_FALSE;
+    UA_Boolean realloced = false;
     do {
         retval = c->connection.recv(&c->connection, &reply, c->config.timeout);
         retval |= UA_Connection_completeMessages(&c->connection, &reply, &realloced);
@@ -240,7 +239,7 @@ static UA_StatusCode SecureChannelHandshake(UA_Client *client, UA_Boolean renew)
 
     UA_ByteString reply;
     UA_ByteString_init(&reply);
-    UA_Boolean realloced = UA_FALSE;
+    UA_Boolean realloced = false;
     do {
         retval = c->recv(c, &reply, client->config.timeout);
         retval |= UA_Connection_completeMessages(c, &reply, &realloced);
@@ -372,8 +371,8 @@ static UA_StatusCode EndpointsHandshake(UA_Client *client) {
     size_t endpointArraySize = 0;
     UA_StatusCode retval = GetEndpoints(client, &endpointArraySize, &endpointArray);
 
-    UA_Boolean endpointFound = UA_FALSE;
-    UA_Boolean tokenFound = UA_FALSE;
+    UA_Boolean endpointFound = false;
+    UA_Boolean tokenFound = false;
     UA_String securityNone = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#None");
     UA_String binaryTransport = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/uatcp-uasc-uabinary");
 
@@ -387,14 +386,14 @@ static UA_StatusCode EndpointsHandshake(UA_Client *client) {
         /* look out for an endpoint without security */
         if(!UA_String_equal(&endpoint->securityPolicyUri, &securityNone))
             continue;
-        endpointFound = UA_TRUE;
+        endpointFound = true;
         /* endpoint with no security found */
         /* look for a user token policy with an anonymous token */
         for(size_t j = 0; j < endpoint->userIdentityTokensSize; ++j) {
             UA_UserTokenPolicy* userToken = &endpoint->userIdentityTokens[j];
             if(userToken->tokenType != UA_USERTOKENTYPE_ANONYMOUS)
                 continue;
-            tokenFound = UA_TRUE;
+            tokenFound = true;
             UA_UserTokenPolicy_copy(userToken, &client->token);
             break;
         }
@@ -444,7 +443,7 @@ static UA_StatusCode CloseSession(UA_Client *client) {
 
     request.requestHeader.timestamp = UA_DateTime_now();
     request.requestHeader.timeoutHint = 10000;
-    request.deleteSubscriptions = UA_TRUE;
+    request.deleteSubscriptions = true;
     UA_NodeId_copy(&client->authenticationToken, &request.requestHeader.authenticationToken);
     UA_CloseSessionResponse response;
     __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST],
@@ -529,7 +528,7 @@ UA_Client_getEndpoints(UA_Client *client, UA_ConnectClientConnection connectFunc
     client->connection.localConf = client->config.localConnectionConfig;
     retval = HelAckHandshake(client);
     if(retval == UA_STATUSCODE_GOOD)
-        retval = SecureChannelHandshake(client, UA_FALSE);
+        retval = SecureChannelHandshake(client, false);
     if(retval == UA_STATUSCODE_GOOD)
         retval = GetEndpoints(client, endpointDescriptionsSize, endpointDescriptions);
     //we always cleanup
@@ -562,7 +561,7 @@ UA_StatusCode UA_Client_connect(UA_Client *client, UA_ConnectClientConnection co
     client->connection.localConf = client->config.localConnectionConfig;
     retval = HelAckHandshake(client);
     if(retval == UA_STATUSCODE_GOOD)
-        retval = SecureChannelHandshake(client, UA_FALSE);
+        retval = SecureChannelHandshake(client, false);
     if(retval == UA_STATUSCODE_GOOD)
         retval = EndpointsHandshake(client);
     if(retval == UA_STATUSCODE_GOOD)
@@ -596,7 +595,7 @@ UA_StatusCode UA_Client_disconnect(UA_Client *client) {
 }
 
 UA_StatusCode UA_Client_manuallyRenewSecureChannel(UA_Client *client) {
-    return SecureChannelHandshake(client, UA_TRUE);
+    return SecureChannelHandshake(client, true);
 }
 
 /****************/
@@ -642,7 +641,7 @@ void __UA_Client_Service(UA_Client *client, const void *r, const UA_DataType *re
     // Todo: push this into the generic securechannel implementation for client and server
     UA_ByteString reply;
     UA_ByteString_init(&reply);
-    UA_Boolean realloced = UA_FALSE;
+    UA_Boolean realloced = false;
     do {
         retval = client->connection.recv(&client->connection, &reply, client->config.timeout);
         retval |= UA_Connection_completeMessages(&client->connection, &reply, &realloced);

+ 9 - 9
src/client/ua_client_highlevel_subscriptions.c

@@ -8,7 +8,7 @@ const UA_SubscriptionSettings UA_SubscriptionSettings_standard = {
     .requestedLifetimeCount = 100,
     .requestedMaxKeepAliveCount = 10,
     .maxNotificationsPerPublish = 10,
-    .publishingEnabled = UA_TRUE,
+    .publishingEnabled = true,
     .priority = 0
 };
 
@@ -112,7 +112,7 @@ UA_Client_Subscriptions_addMonitoredItem(UA_Client *client, UA_UInt32 subscripti
     item.monitoringMode = UA_MONITORINGMODE_REPORTING;
     item.requestedParameters.clientHandle = ++(client->monitoredItemHandles);
     item.requestedParameters.samplingInterval = sub->PublishingInterval;
-    item.requestedParameters.discardOldest = UA_TRUE;
+    item.requestedParameters.discardOldest = true;
     item.requestedParameters.queueSize = 1;
     request.itemsToCreate = &item;
     request.itemsToCreateSize = 1;
@@ -135,7 +135,7 @@ UA_Client_Subscriptions_addMonitoredItem(UA_Client *client, UA_UInt32 subscripti
         newMon->ClientHandle = client->monitoredItemHandles;
         newMon->SamplingInterval = sub->PublishingInterval;
         newMon->QueueSize = 1;
-        newMon->DiscardOldest = UA_TRUE;
+        newMon->DiscardOldest = true;
         newMon->handler = handlingFunction;
         newMon->handlerContext = handlingContext;
         newMon->MonitoredItemId = response.results[0].monitoredItemId;
@@ -195,7 +195,7 @@ UA_Client_Subscriptions_removeMonitoredItem(UA_Client *client, UA_UInt32 subscri
 static UA_Boolean
 UA_Client_processPublishRx(UA_Client *client, UA_PublishResponse response) {
     if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD)
-        return UA_FALSE;
+        return false;
     
     // Check if the server has acknowledged any of our ACKS
     // Note that a list of serverside status codes may be send without valid publish data, i.e. 
@@ -212,7 +212,7 @@ UA_Client_processPublishRx(UA_Client *client, UA_PublishResponse response) {
     }
     
     if(response.subscriptionId == 0)
-        return UA_FALSE;
+        return false;
     
     UA_Client_Subscription *sub;
     LIST_FOREACH(sub, &client->subscriptions, listEntry) {
@@ -220,7 +220,7 @@ UA_Client_processPublishRx(UA_Client *client, UA_PublishResponse response) {
             break;
     }
     if(!sub)
-        return UA_FALSE;
+        return false;
     
     UA_NotificationMessage msg = response.notificationMessage;
     UA_Client_MonitoredItem *mon;
@@ -279,7 +279,7 @@ UA_StatusCode UA_Client_Subscriptions_manuallySendPublishRequest(UA_Client *clie
     if (client->state == UA_CLIENTSTATE_ERRORED){
         return UA_STATUSCODE_BADSERVERNOTCONNECTED;
     }
-    UA_Boolean moreNotifications = UA_TRUE;
+    UA_Boolean moreNotifications = true;
     do {
         UA_PublishRequest request;
         UA_PublishRequest_init(&request);
@@ -306,10 +306,10 @@ UA_StatusCode UA_Client_Subscriptions_manuallySendPublishRequest(UA_Client *clie
         if(response.responseHeader.serviceResult == UA_STATUSCODE_GOOD)
             moreNotifications = UA_Client_processPublishRx(client, response);
         else
-            moreNotifications = UA_FALSE;
+            moreNotifications = false;
         
         UA_PublishResponse_deleteMembers(&response);
         UA_PublishRequest_deleteMembers(&request);
-    } while(moreNotifications == UA_TRUE);
+    } while(moreNotifications == true);
     return UA_STATUSCODE_GOOD;
 }

+ 7 - 7
src/server/ua_nodestore.c

@@ -84,7 +84,7 @@ static void deleteEntry(UA_NodeStoreEntry *entry) {
     UA_free(entry);
 }
 
-/* Returns UA_TRUE if an entry was found under the nodeid. Otherwise, returns
+/* Returns true if an entry was found under the nodeid. Otherwise, returns
    false and sets slot to a pointer to the next free slot. */
 static UA_Boolean
 containsNodeId(const UA_NodeStore *ns, const UA_NodeId *nodeid, UA_NodeStoreEntry ***entry) {
@@ -95,12 +95,12 @@ containsNodeId(const UA_NodeStore *ns, const UA_NodeId *nodeid, UA_NodeStoreEntr
 
     if(!e) {
         *entry = &ns->entries[idx];
-        return UA_FALSE;
+        return false;
     }
 
     if(UA_NodeId_equal(&e->node.nodeId, nodeid)) {
         *entry = &ns->entries[idx];
-        return UA_TRUE;
+        return true;
     }
 
     hash_t hash2 = mod2(h, size);
@@ -111,16 +111,16 @@ containsNodeId(const UA_NodeStore *ns, const UA_NodeId *nodeid, UA_NodeStoreEntr
         e = ns->entries[idx];
         if(!e) {
             *entry = &ns->entries[idx];
-            return UA_FALSE;
+            return false;
         }
         if(UA_NodeId_equal(&e->node.nodeId, nodeid)) {
             *entry = &ns->entries[idx];
-            return UA_TRUE;
+            return true;
         }
     }
 
     /* NOTREACHED */
-    return UA_TRUE;
+    return true;
 }
 
 /* The occupancy of the table after the call will be about 50% */
@@ -213,7 +213,7 @@ UA_StatusCode UA_NodeStore_insert(UA_NodeStore *ns, UA_Node *node) {
         UA_UInt32 identifier = ns->count+1; // start value
         UA_UInt32 size = ns->size;
         hash_t increase = mod2(identifier, size);
-        while(UA_TRUE) {
+        while(true) {
             node->nodeId.identifier.numeric = identifier;
             if(!containsNodeId(ns, &node->nodeId, &entry))
                 break;

+ 1 - 1
src/server/ua_nodestore_concurrent.c

@@ -129,7 +129,7 @@ UA_StatusCode UA_NodeStore_insert(UA_NodeStore *ns, UA_Node *node) {
         identifier++;
 
         node->nodeId.identifier.numeric = (UA_UInt32)identifier;
-        while(UA_TRUE) {
+        while(true) {
             hash_t h = hash(&node->nodeId);
             result = cds_lfht_add_unique(ht, h, compare, &node->nodeId, &entry->htn);
             if(result == &entry->htn)

+ 1 - 1
src/server/ua_nodestore_hash.inc

@@ -73,7 +73,7 @@ static hash_t hash(const UA_NodeId *n) {
         return hash_array((const UA_Byte*)n->identifier.byteString.data,
                           (UA_UInt32)n->identifier.byteString.length, n->namespaceIndex);
     default:
-        UA_assert(UA_FALSE);
+        UA_assert(false);
         return 0;
     }
 }

+ 94 - 94
src/server/ua_server.c

@@ -41,8 +41,8 @@ const UA_ServerConfig UA_ServerConfig_standard = {
 
     .networkLayersSize = 0, .networkLayers = NULL,
 
-    .enableAnonymousLogin = UA_TRUE,
-    .enableUsernamePasswordLogin = UA_TRUE,
+    .enableAnonymousLogin = true,
+    .enableUsernamePasswordLogin = true,
     .usernamePasswordLogins =
     { { UA_STRING_STATIC("user1"), UA_STRING_STATIC("password") },
       { UA_STRING_STATIC("uset2"), UA_STRING_STATIC("password1") } },
@@ -50,7 +50,7 @@ const UA_ServerConfig UA_ServerConfig_standard = {
 };
 
 #if defined(UA_ENABLE_MULTITHREADING) && !defined(NDEBUG)
-UA_THREAD_LOCAL bool rcu_locked = UA_FALSE;
+UA_THREAD_LOCAL bool rcu_locked = false;
 #endif
 
 static const UA_NodeId nodeIdHasSubType = {
@@ -291,7 +291,7 @@ static UA_StatusCode
 readStatus(void *handle, const UA_NodeId nodeid, UA_Boolean sourceTimeStamp,
            const UA_NumericRange *range, UA_DataValue *value) {
     if(range) {
-        value->hasStatus = UA_TRUE;
+        value->hasStatus = true;
         value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
         return UA_STATUSCODE_GOOD;
     }
@@ -308,9 +308,9 @@ readStatus(void *handle, const UA_NodeId nodeid, UA_Boolean sourceTimeStamp,
     value->value.data = status;
     value->value.arrayDimensionsSize = 0;
     value->value.arrayDimensions = NULL;
-    value->hasValue = UA_TRUE;
+    value->hasValue = true;
     if(sourceTimeStamp) {
-        value->hasSourceTimestamp = UA_TRUE;
+        value->hasSourceTimestamp = true;
         value->sourceTimestamp = UA_DateTime_now();
     }
     return UA_STATUSCODE_GOOD;
@@ -320,7 +320,7 @@ static UA_StatusCode
 readNamespaces(void *handle, const UA_NodeId nodeid, UA_Boolean sourceTimestamp,
                const UA_NumericRange *range, UA_DataValue *value) {
     if(range) {
-        value->hasStatus = UA_TRUE;
+        value->hasStatus = true;
         value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
         return UA_STATUSCODE_GOOD;
     }
@@ -330,9 +330,9 @@ readNamespaces(void *handle, const UA_NodeId nodeid, UA_Boolean sourceTimestamp,
                                      server->namespacesSize, &UA_TYPES[UA_TYPES_STRING]);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
-    value->hasValue = UA_TRUE;
+    value->hasValue = true;
     if(sourceTimestamp) {
-        value->hasSourceTimestamp = UA_TRUE;
+        value->hasSourceTimestamp = true;
         value->sourceTimestamp = UA_DateTime_now();
     }
     return UA_STATUSCODE_GOOD;
@@ -342,7 +342,7 @@ static UA_StatusCode
 readCurrentTime(void *handle, const UA_NodeId nodeid, UA_Boolean sourceTimeStamp,
                 const UA_NumericRange *range, UA_DataValue *value) {
     if(range) {
-        value->hasStatus = UA_TRUE;
+        value->hasStatus = true;
         value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
         return UA_STATUSCODE_GOOD;
     }
@@ -350,9 +350,9 @@ readCurrentTime(void *handle, const UA_NodeId nodeid, UA_Boolean sourceTimeStamp
     UA_StatusCode retval = UA_Variant_setScalarCopy(&value->value, &currentTime, &UA_TYPES[UA_TYPES_DATETIME]);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
-    value->hasValue = UA_TRUE;
+    value->hasValue = true;
     if(sourceTimeStamp) {
-        value->hasSourceTimestamp = UA_TRUE;
+        value->hasSourceTimestamp = true;
         value->sourceTimestamp = currentTime;
     }
     return UA_STATUSCODE_GOOD;
@@ -505,8 +505,8 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     UA_ReferenceTypeNode *references = UA_NodeStore_newReferenceTypeNode();
     copyNames((UA_Node*)references, "References");
     references->nodeId.identifier.numeric = UA_NS0ID_REFERENCES;
-    references->isAbstract = UA_TRUE;
-    references->symmetric = UA_TRUE;
+    references->isAbstract = true;
+    references->symmetric = true;
     references->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "References");
     /* The reference to root is later inserted */
     UA_RCU_LOCK();
@@ -517,8 +517,8 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     copyNames((UA_Node*)hassubtype, "HasSubtype");
     hassubtype->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "HasSupertype");
     hassubtype->nodeId.identifier.numeric = UA_NS0ID_HASSUBTYPE;
-    hassubtype->isAbstract = UA_FALSE;
-    hassubtype->symmetric = UA_FALSE;
+    hassubtype->isAbstract = false;
+    hassubtype->symmetric = false;
     /* The reference to root is later inserted */
     UA_RCU_LOCK();
     UA_NodeStore_insert(server->nodestore, (UA_Node*)hassubtype);
@@ -528,24 +528,24 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     UA_ReferenceTypeNode *hierarchicalreferences = UA_NodeStore_newReferenceTypeNode();
     copyNames((UA_Node*)hierarchicalreferences, "Hierarchicalreferences");
     hierarchicalreferences->nodeId.identifier.numeric = UA_NS0ID_HIERARCHICALREFERENCES;
-    hierarchicalreferences->isAbstract = UA_TRUE;
-    hierarchicalreferences->symmetric  = UA_FALSE;
+    hierarchicalreferences->isAbstract = true;
+    hierarchicalreferences->symmetric  = false;
     addNodeInternal(server, (UA_Node*)hierarchicalreferences,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_REFERENCES), nodeIdHasSubType);
 
     UA_ReferenceTypeNode *nonhierarchicalreferences = UA_NodeStore_newReferenceTypeNode();
     copyNames((UA_Node*)nonhierarchicalreferences, "NonHierarchicalReferences");
     nonhierarchicalreferences->nodeId.identifier.numeric = UA_NS0ID_NONHIERARCHICALREFERENCES;
-    nonhierarchicalreferences->isAbstract = UA_TRUE;
-    nonhierarchicalreferences->symmetric  = UA_FALSE;
+    nonhierarchicalreferences->isAbstract = true;
+    nonhierarchicalreferences->symmetric  = false;
     addNodeInternal(server, (UA_Node*)nonhierarchicalreferences,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_REFERENCES), nodeIdHasSubType);
 
     UA_ReferenceTypeNode *haschild = UA_NodeStore_newReferenceTypeNode();
     copyNames((UA_Node*)haschild, "HasChild");
     haschild->nodeId.identifier.numeric = UA_NS0ID_HASCHILD;
-    haschild->isAbstract = UA_TRUE;
-    haschild->symmetric  = UA_FALSE;
+    haschild->isAbstract = true;
+    haschild->symmetric  = false;
     addNodeInternal(server, (UA_Node*)haschild,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_HIERARCHICALREFERENCES), nodeIdHasSubType);
 
@@ -553,8 +553,8 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     copyNames((UA_Node*)organizes, "Organizes");
     organizes->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "OrganizedBy");
     organizes->nodeId.identifier.numeric = UA_NS0ID_ORGANIZES;
-    organizes->isAbstract = UA_FALSE;
-    organizes->symmetric  = UA_FALSE;
+    organizes->isAbstract = false;
+    organizes->symmetric  = false;
     addNodeInternal(server, (UA_Node*)organizes,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_HIERARCHICALREFERENCES), nodeIdHasSubType);
 
@@ -562,8 +562,8 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     copyNames((UA_Node*)haseventsource, "HasEventSource");
     haseventsource->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "EventSourceOf");
     haseventsource->nodeId.identifier.numeric = UA_NS0ID_HASEVENTSOURCE;
-    haseventsource->isAbstract = UA_FALSE;
-    haseventsource->symmetric  = UA_FALSE;
+    haseventsource->isAbstract = false;
+    haseventsource->symmetric  = false;
     addNodeInternal(server, (UA_Node*)haseventsource,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_HIERARCHICALREFERENCES), nodeIdHasSubType);
 
@@ -571,40 +571,40 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     copyNames((UA_Node*)hasmodellingrule, "HasModellingRule");
     hasmodellingrule->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "ModellingRuleOf");
     hasmodellingrule->nodeId.identifier.numeric = UA_NS0ID_HASMODELLINGRULE;
-    hasmodellingrule->isAbstract = UA_FALSE;
-    hasmodellingrule->symmetric  = UA_FALSE;
+    hasmodellingrule->isAbstract = false;
+    hasmodellingrule->symmetric  = false;
     addNodeInternal(server, (UA_Node*)hasmodellingrule, nodeIdNonHierarchicalReferences, nodeIdHasSubType);
 
     UA_ReferenceTypeNode *hasencoding = UA_NodeStore_newReferenceTypeNode();
     copyNames((UA_Node*)hasencoding, "HasEncoding");
     hasencoding->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "EncodingOf");
     hasencoding->nodeId.identifier.numeric = UA_NS0ID_HASENCODING;
-    hasencoding->isAbstract = UA_FALSE;
-    hasencoding->symmetric  = UA_FALSE;
+    hasencoding->isAbstract = false;
+    hasencoding->symmetric  = false;
     addNodeInternal(server, (UA_Node*)hasencoding, nodeIdNonHierarchicalReferences, nodeIdHasSubType);
 
     UA_ReferenceTypeNode *hasdescription = UA_NodeStore_newReferenceTypeNode();
     copyNames((UA_Node*)hasdescription, "HasDescription");
     hasdescription->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "DescriptionOf");
     hasdescription->nodeId.identifier.numeric = UA_NS0ID_HASDESCRIPTION;
-    hasdescription->isAbstract = UA_FALSE;
-    hasdescription->symmetric  = UA_FALSE;
+    hasdescription->isAbstract = false;
+    hasdescription->symmetric  = false;
     addNodeInternal(server, (UA_Node*)hasdescription, nodeIdNonHierarchicalReferences, nodeIdHasSubType);
 
     UA_ReferenceTypeNode *hastypedefinition = UA_NodeStore_newReferenceTypeNode();
     copyNames((UA_Node*)hastypedefinition, "HasTypeDefinition");
     hastypedefinition->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "TypeDefinitionOf");
     hastypedefinition->nodeId.identifier.numeric = UA_NS0ID_HASTYPEDEFINITION;
-    hastypedefinition->isAbstract = UA_FALSE;
-    hastypedefinition->symmetric  = UA_FALSE;
+    hastypedefinition->isAbstract = false;
+    hastypedefinition->symmetric  = false;
     addNodeInternal(server, (UA_Node*)hastypedefinition, nodeIdNonHierarchicalReferences, nodeIdHasSubType);
 
     UA_ReferenceTypeNode *generatesevent = UA_NodeStore_newReferenceTypeNode();
     copyNames((UA_Node*)generatesevent, "GeneratesEvent");
     generatesevent->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "GeneratedBy");
     generatesevent->nodeId.identifier.numeric = UA_NS0ID_GENERATESEVENT;
-    generatesevent->isAbstract = UA_FALSE;
-    generatesevent->symmetric  = UA_FALSE;
+    generatesevent->isAbstract = false;
+    generatesevent->symmetric  = false;
     addNodeInternal(server, (UA_Node*)generatesevent, nodeIdNonHierarchicalReferences,
                     nodeIdHasSubType);
 
@@ -612,21 +612,21 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     copyNames((UA_Node*)aggregates, "Aggregates");
     // Todo: Is there an inverse name?
     aggregates->nodeId.identifier.numeric = UA_NS0ID_AGGREGATES;
-    aggregates->isAbstract = UA_TRUE;
-    aggregates->symmetric  = UA_FALSE;
+    aggregates->isAbstract = true;
+    aggregates->symmetric  = false;
     addNodeInternal(server, (UA_Node*)aggregates,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCHILD), nodeIdHasSubType);
 
     // complete bootstrap of hassubtype
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_HASCHILD), nodeIdHasSubType,
-                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE), UA_TRUE);
+                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE), true);
 
     UA_ReferenceTypeNode *hasproperty = UA_NodeStore_newReferenceTypeNode();
     copyNames((UA_Node*)hasproperty, "HasProperty");
     hasproperty->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "PropertyOf");
     hasproperty->nodeId.identifier.numeric = UA_NS0ID_HASPROPERTY;
-    hasproperty->isAbstract = UA_FALSE;
-    hasproperty->symmetric  = UA_FALSE;
+    hasproperty->isAbstract = false;
+    hasproperty->symmetric  = false;
     addNodeInternal(server, (UA_Node*)hasproperty,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_AGGREGATES), nodeIdHasSubType);
 
@@ -634,8 +634,8 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     copyNames((UA_Node*)hascomponent, "HasComponent");
     hascomponent->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "ComponentOf");
     hascomponent->nodeId.identifier.numeric = UA_NS0ID_HASCOMPONENT;
-    hascomponent->isAbstract = UA_FALSE;
-    hascomponent->symmetric  = UA_FALSE;
+    hascomponent->isAbstract = false;
+    hascomponent->symmetric  = false;
     addNodeInternal(server, (UA_Node*)hascomponent,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_AGGREGATES), nodeIdHasSubType);
 
@@ -643,8 +643,8 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     copyNames((UA_Node*)hasnotifier, "HasNotifier");
     hasnotifier->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "NotifierOf");
     hasnotifier->nodeId.identifier.numeric = UA_NS0ID_HASNOTIFIER;
-    hasnotifier->isAbstract = UA_FALSE;
-    hasnotifier->symmetric  = UA_FALSE;
+    hasnotifier->isAbstract = false;
+    hasnotifier->symmetric  = false;
     addNodeInternal(server, (UA_Node*)hasnotifier, UA_NODEID_NUMERIC(0, UA_NS0ID_HASEVENTSOURCE),
                     nodeIdHasSubType);
 
@@ -652,8 +652,8 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     copyNames((UA_Node*)hasorderedcomponent, "HasOrderedComponent");
     hasorderedcomponent->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "OrderedComponentOf");
     hasorderedcomponent->nodeId.identifier.numeric = UA_NS0ID_HASORDEREDCOMPONENT;
-    hasorderedcomponent->isAbstract = UA_FALSE;
-    hasorderedcomponent->symmetric  = UA_FALSE;
+    hasorderedcomponent->isAbstract = false;
+    hasorderedcomponent->symmetric  = false;
     addNodeInternal(server, (UA_Node*)hasorderedcomponent, UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                     nodeIdHasSubType);
 
@@ -661,48 +661,48 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     copyNames((UA_Node*)hasmodelparent, "HasModelParent");
     hasmodelparent->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "ModelParentOf");
     hasmodelparent->nodeId.identifier.numeric = UA_NS0ID_HASMODELPARENT;
-    hasmodelparent->isAbstract = UA_FALSE;
-    hasmodelparent->symmetric  = UA_FALSE;
+    hasmodelparent->isAbstract = false;
+    hasmodelparent->symmetric  = false;
     addNodeInternal(server, (UA_Node*)hasmodelparent, nodeIdNonHierarchicalReferences, nodeIdHasSubType);
 
     UA_ReferenceTypeNode *fromstate = UA_NodeStore_newReferenceTypeNode();
     copyNames((UA_Node*)fromstate, "FromState");
     fromstate->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "ToTransition");
     fromstate->nodeId.identifier.numeric = UA_NS0ID_FROMSTATE;
-    fromstate->isAbstract = UA_FALSE;
-    fromstate->symmetric  = UA_FALSE;
+    fromstate->isAbstract = false;
+    fromstate->symmetric  = false;
     addNodeInternal(server, (UA_Node*)fromstate, nodeIdNonHierarchicalReferences, nodeIdHasSubType);
 
     UA_ReferenceTypeNode *tostate = UA_NodeStore_newReferenceTypeNode();
     copyNames((UA_Node*)tostate, "ToState");
     tostate->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "FromTransition");
     tostate->nodeId.identifier.numeric = UA_NS0ID_TOSTATE;
-    tostate->isAbstract = UA_FALSE;
-    tostate->symmetric  = UA_FALSE;
+    tostate->isAbstract = false;
+    tostate->symmetric  = false;
     addNodeInternal(server, (UA_Node*)tostate, nodeIdNonHierarchicalReferences, nodeIdHasSubType);
 
     UA_ReferenceTypeNode *hascause = UA_NodeStore_newReferenceTypeNode();
     copyNames((UA_Node*)hascause, "HasCause");
     hascause->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "MayBeCausedBy");
     hascause->nodeId.identifier.numeric = UA_NS0ID_HASCAUSE;
-    hascause->isAbstract = UA_FALSE;
-    hascause->symmetric  = UA_FALSE;
+    hascause->isAbstract = false;
+    hascause->symmetric  = false;
     addNodeInternal(server, (UA_Node*)hascause, nodeIdNonHierarchicalReferences, nodeIdHasSubType);
     
     UA_ReferenceTypeNode *haseffect = UA_NodeStore_newReferenceTypeNode();
     copyNames((UA_Node*)haseffect, "HasEffect");
     haseffect->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "MayBeEffectedBy");
     haseffect->nodeId.identifier.numeric = UA_NS0ID_HASEFFECT;
-    haseffect->isAbstract = UA_FALSE;
-    haseffect->symmetric  = UA_FALSE;
+    haseffect->isAbstract = false;
+    haseffect->symmetric  = false;
     addNodeInternal(server, (UA_Node*)haseffect, nodeIdNonHierarchicalReferences, nodeIdHasSubType);
 
     UA_ReferenceTypeNode *hashistoricalconfiguration = UA_NodeStore_newReferenceTypeNode();
     copyNames((UA_Node*)hashistoricalconfiguration, "HasHistoricalConfiguration");
     hashistoricalconfiguration->inverseName = UA_LOCALIZEDTEXT_ALLOC("en_US", "HistoricalConfigurationOf");
     hashistoricalconfiguration->nodeId.identifier.numeric = UA_NS0ID_HASHISTORICALCONFIGURATION;
-    hashistoricalconfiguration->isAbstract = UA_FALSE;
-    hashistoricalconfiguration->symmetric  = UA_FALSE;
+    hashistoricalconfiguration->isAbstract = false;
+    hashistoricalconfiguration->symmetric  = false;
     addNodeInternal(server, (UA_Node*)hashistoricalconfiguration,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_AGGREGATES), nodeIdHasSubType);
 
@@ -742,7 +742,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
                     nodeIdOrganizes);
 
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_REFERENCETYPESFOLDER), nodeIdOrganizes,
-                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_REFERENCES), UA_TRUE);
+                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_REFERENCES), true);
 
     /**********************/
     /* Basic Object Types */
@@ -758,17 +758,17 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
                       UA_NS0ID_ORGANIZES);
     addObjectTypeNode(server, "FolderType", UA_NS0ID_FOLDERTYPE, UA_NS0ID_BASEOBJECTTYPE, UA_NS0ID_HASSUBTYPE);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTTYPESFOLDER), nodeIdHasTypeDefinition,
-                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), UA_TRUE);
+                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), true);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_ROOTFOLDER), nodeIdHasTypeDefinition,
-                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), UA_TRUE);
+                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), true);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), nodeIdHasTypeDefinition,
-                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), UA_TRUE);
+                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), true);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_TYPESFOLDER), nodeIdHasTypeDefinition,
-                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), UA_TRUE);
+                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), true);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_VIEWSFOLDER), nodeIdHasTypeDefinition,
-                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), UA_TRUE);
+                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), true);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_REFERENCETYPESFOLDER),
-                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), UA_TRUE);
+                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), true);
     addObjectTypeNode(server, "ServerType", UA_NS0ID_SERVERTYPE, UA_NS0ID_BASEOBJECTTYPE, UA_NS0ID_HASSUBTYPE);
     addObjectTypeNode(server, "ServerDiagnosticsType", UA_NS0ID_SERVERDIAGNOSTICSTYPE,
                       UA_NS0ID_BASEOBJECTTYPE, UA_NS0ID_HASSUBTYPE);
@@ -788,7 +788,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     datatypes->nodeId.identifier.numeric = UA_NS0ID_DATATYPESFOLDER;
     addNodeInternal(server, (UA_Node*)datatypes, UA_NODEID_NUMERIC(0, UA_NS0ID_TYPESFOLDER), nodeIdOrganizes);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATATYPESFOLDER), nodeIdHasTypeDefinition,
-                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), UA_TRUE);
+                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), true);
 
     addDataTypeNode(server, "BaseDataType", UA_NS0ID_BASEDATATYPE, UA_NS0ID_DATATYPESFOLDER);
     addDataTypeNode(server, "Boolean", UA_NS0ID_BOOLEAN, UA_NS0ID_BASEDATATYPE);
@@ -829,13 +829,13 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)variabletypes, UA_NODEID_NUMERIC(0, UA_NS0ID_TYPESFOLDER),
                     nodeIdOrganizes);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_VARIABLETYPESFOLDER),
-                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), UA_TRUE);
+                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), true);
     addVariableTypeNode_organized(server, "BaseVariableType", UA_NS0ID_BASEVARIABLETYPE,
-                                  UA_NS0ID_VARIABLETYPESFOLDER, UA_TRUE);
+                                  UA_NS0ID_VARIABLETYPESFOLDER, true);
     addVariableTypeNode_subtype(server, "BaseDataVariableType", UA_NS0ID_BASEDATAVARIABLETYPE,
-                                UA_NS0ID_BASEVARIABLETYPE, UA_FALSE);
+                                UA_NS0ID_BASEVARIABLETYPE, false);
     addVariableTypeNode_subtype(server, "PropertyType", UA_NS0ID_PROPERTYTYPE,
-                                UA_NS0ID_BASEVARIABLETYPE, UA_FALSE);
+                                UA_NS0ID_BASEVARIABLETYPE, false);
 #endif
 
 #ifdef UA_ENABLE_GENERATE_NAMESPACE0
@@ -853,7 +853,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)servernode, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
                     nodeIdOrganizes);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), nodeIdHasTypeDefinition,
-                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_SERVERTYPE), UA_TRUE);
+                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_SERVERTYPE), true);
 
     UA_VariableNode *namespaceArray = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)namespaceArray, "NamespaceArray");
@@ -865,7 +865,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     namespaceArray->minimumSamplingInterval = 1.0;
     addNodeInternal(server, (UA_Node*)namespaceArray, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), nodeIdHasProperty);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_NAMESPACEARRAY),
-                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE), UA_TRUE);
+                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE), true);
 
     UA_VariableNode *serverArray = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)serverArray, "ServerArray");
@@ -877,7 +877,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     serverArray->minimumSamplingInterval = 1.0;
     addNodeInternal(server, (UA_Node*)serverArray, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), nodeIdHasProperty);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERARRAY), nodeIdHasTypeDefinition,
-                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE), UA_TRUE);
+                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE), true);
 
     UA_ObjectNode *servercapablities = UA_NodeStore_newObjectNode();
     copyNames((UA_Node*)servercapablities, "ServerCapabilities");
@@ -885,7 +885,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)servercapablities, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER),
                     nodeIdHasComponent);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES), nodeIdHasTypeDefinition,
-                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_SERVERCAPABILITIESTYPE), UA_TRUE);
+                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_SERVERCAPABILITIESTYPE), true);
 
     UA_VariableNode *localeIdArray = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)localeIdArray, "LocaleIdArray");
@@ -899,7 +899,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)localeIdArray,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES), nodeIdHasProperty);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_LOCALEIDARRAY),
-                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE), UA_TRUE);
+                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE), true);
 
     UA_VariableNode *maxBrowseContinuationPoints = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)maxBrowseContinuationPoints, "MaxBrowseContinuationPoints");
@@ -911,7 +911,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)maxBrowseContinuationPoints,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES), nodeIdHasProperty);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MAXBROWSECONTINUATIONPOINTS),
-                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE), UA_TRUE);
+                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE), true);
 
     /** ServerProfileArray **/
 #define MAX_PROFILEARRAY 16 //a *magic* limit to the number of supported profiles
@@ -943,7 +943,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)serverProfileArray,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES), nodeIdHasProperty);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_SERVERPROFILEARRAY),
-                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE), UA_TRUE);
+                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE), true);
 
     UA_ObjectNode *serverdiagnostics = UA_NodeStore_newObjectNode();
     copyNames((UA_Node*)serverdiagnostics, "ServerDiagnostics");
@@ -951,7 +951,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)serverdiagnostics,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), nodeIdHasComponent);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS),
-                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_SERVERDIAGNOSTICSTYPE), UA_TRUE);
+                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_SERVERDIAGNOSTICSTYPE), true);
 
     UA_VariableNode *enabledFlag = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)enabledFlag, "EnabledFlag");
@@ -963,7 +963,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)enabledFlag,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS), nodeIdHasProperty);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_ENABLEDFLAG),
-                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE), UA_TRUE);
+                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE), true);
 
     UA_VariableNode *serverstatus = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)serverstatus, "ServerStatus");
@@ -972,7 +972,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     serverstatus->value.dataSource = (UA_DataSource) {.handle = server, .read = readStatus, .write = NULL};
     addNodeInternal(server, (UA_Node*)serverstatus, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), nodeIdHasComponent);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS), nodeIdHasTypeDefinition,
-                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_SERVERSTATUSTYPE), UA_TRUE);
+                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_SERVERSTATUSTYPE), true);
 
     UA_VariableNode *starttime = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)starttime, "StartTime");
@@ -983,7 +983,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)starttime, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS),
                     nodeIdHasComponent);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STARTTIME),
-                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, UA_TRUE);
+                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, true);
 
     UA_VariableNode *currenttime = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)currenttime, "CurrentTime");
@@ -994,7 +994,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)currenttime,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS), nodeIdHasComponent);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME),
-                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, UA_TRUE);
+                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, true);
 
     UA_VariableNode *state = UA_NodeStore_newVariableNode();
     UA_ServerState *stateEnum = UA_ServerState_new();
@@ -1007,7 +1007,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)state, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS),
                     nodeIdHasComponent);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE),
-                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, UA_TRUE);
+                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, true);
 
     UA_VariableNode *buildinfo = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)buildinfo, "BuildInfo");
@@ -1018,7 +1018,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)buildinfo,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS), nodeIdHasComponent);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO),
-                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_BUILDINFOTYPE), UA_TRUE);
+                         nodeIdHasTypeDefinition, UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_BUILDINFOTYPE), true);
 
     UA_VariableNode *producturi = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)producturi, "ProductUri");
@@ -1029,7 +1029,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)producturi,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO), nodeIdHasComponent);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO_PRODUCTURI),
-                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, UA_TRUE);
+                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, true);
 
     UA_VariableNode *manufacturername = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)manufacturername, "ManufacturerName");
@@ -1040,7 +1040,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)manufacturername,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO), nodeIdHasComponent);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO_MANUFACTURERNAME),
-                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, UA_TRUE);
+                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, true);
 
     UA_VariableNode *productname = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)productname, "ProductName");
@@ -1050,7 +1050,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)productname,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO), nodeIdHasComponent);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO_PRODUCTNAME),
-                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, UA_TRUE);
+                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, true);
 
     UA_VariableNode *softwareversion = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)softwareversion, "SoftwareVersion");
@@ -1060,7 +1060,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)softwareversion,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO), nodeIdHasComponent);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO_SOFTWAREVERSION),
-                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, UA_TRUE);
+                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, true);
 
     UA_VariableNode *buildnumber = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)buildnumber, "BuildNumber");
@@ -1070,7 +1070,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)buildnumber,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO), nodeIdHasComponent);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO_BUILDNUMBER),
-                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, UA_TRUE);
+                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, true);
 
     UA_VariableNode *builddate = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)builddate, "BuildDate");
@@ -1080,7 +1080,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)builddate,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO), nodeIdHasComponent);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO_BUILDNUMBER),
-                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, UA_TRUE);
+                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, true);
 
     UA_VariableNode *secondstillshutdown = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)secondstillshutdown, "SecondsTillShutdown");
@@ -1090,7 +1090,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)secondstillshutdown,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS), nodeIdHasComponent);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_SECONDSTILLSHUTDOWN),
-                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, UA_TRUE);
+                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, true);
 
     UA_VariableNode *shutdownreason = UA_NodeStore_newVariableNode();
     copyNames((UA_Node*)shutdownreason, "ShutdownReason");
@@ -1100,7 +1100,7 @@ UA_Server * UA_Server_new(const UA_ServerConfig config) {
     addNodeInternal(server, (UA_Node*)shutdownreason,
                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS), nodeIdHasComponent);
     addReferenceInternal(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_SHUTDOWNREASON),
-                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, UA_TRUE);
+                         nodeIdHasTypeDefinition, expandedNodeIdBaseDataVariabletype, true);
     return server;
 }
 
@@ -1120,7 +1120,7 @@ __UA_Server_write(UA_Server *server, const UA_NodeId *nodeId,
             return UA_STATUSCODE_BADTYPEMISMATCH;
         wvalue.value.value = *(const UA_Variant*)value;
     }
-    wvalue.value.hasValue = UA_TRUE;
+    wvalue.value.hasValue = true;
     UA_RCU_LOCK();
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wvalue);
     UA_RCU_UNLOCK();

+ 4 - 4
src/server/ua_server_binary.c

@@ -321,7 +321,7 @@ appendChunkedMessage(struct ChunkEntry *ch, const UA_ByteString *msg, size_t *po
     UA_UInt32_decodeBinary(msg, pos, &len);
     if (len > msg->length) {
         UA_ByteString_deleteMembers(&ch->bytes);
-        ch->invalid_message = UA_TRUE;
+        ch->invalid_message = true;
         return;
     }
     len -= 24;
@@ -330,7 +330,7 @@ appendChunkedMessage(struct ChunkEntry *ch, const UA_ByteString *msg, size_t *po
     UA_Byte* new_bytes = UA_realloc(ch->bytes.data, ch->bytes.length + len);
     if (! new_bytes) {
         UA_ByteString_deleteMembers(&ch->bytes);
-        ch->invalid_message = UA_TRUE;
+        ch->invalid_message = true;
         return;
     }
     ch->bytes.data = new_bytes;
@@ -397,7 +397,7 @@ processMSG(UA_Connection *connection, UA_Server *server, const UA_ByteString *ms
         ch = chunkEntryFromRequestId(channel, sequenceHeader.requestId);
         if (! ch) {
             ch = UA_calloc(1, sizeof(struct ChunkEntry));
-            ch->invalid_message = UA_FALSE;
+            ch->invalid_message = false;
             ch->requestId = sequenceHeader.requestId;
             UA_ByteString_init(&ch->bytes);
             LIST_INSERT_HEAD(&channel->chunks, ch, pointers);
@@ -498,7 +498,7 @@ processMSG(UA_Connection *connection, UA_Server *server, const UA_ByteString *ms
         /* session id 0 -> anonymous session */
         UA_Session_init(&anonymousSession);
         anonymousSession.channel = channel;
-        anonymousSession.activated = UA_TRUE;
+        anonymousSession.activated = true;
         session = &anonymousSession;
     }
 

+ 4 - 4
src/server/ua_server_worker.c

@@ -321,7 +321,7 @@ static UA_DateTime processRepeatedJobs(UA_Server *server, UA_DateTime current) {
 
         //start iterating the list from the beginning
         struct RepeatedJobs *prevTw = LIST_FIRST(&server->repeatedJobs); // after which tw do we insert?
-        while(UA_TRUE) {
+        while(true) {
             struct RepeatedJobs *n = LIST_NEXT(prevTw, pointers);
             if(!n || n->nextTime > tw->nextTime)
                 break;
@@ -498,10 +498,10 @@ dispatchDelayedJobs(UA_Server *server, void *_) {
             dw = dw->next;
             continue;
         }
-        UA_Boolean allMoved = UA_TRUE;
+        UA_Boolean allMoved = true;
         for(size_t i = 0; i < server->config.nThreads; i++) {
             if(dw->workerCounters[i] == server->workers[i].counter) {
-                allMoved = UA_FALSE;
+                allMoved = false;
                 break;
             }
         }
@@ -675,6 +675,6 @@ UA_StatusCode UA_Server_run(UA_Server *server, volatile UA_Boolean *running) {
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
     while(*running)
-        UA_Server_run_iterate(server, UA_TRUE);
+        UA_Server_run_iterate(server, true);
     return UA_Server_run_shutdown(server);
 }

+ 16 - 16
src/server/ua_services_attribute.c

@@ -95,14 +95,14 @@ UA_StatusCode parse_numericrange(const UA_String *str, UA_NumericRange *range) {
 
 static void handleServerTimestamps(UA_TimestampsToReturn timestamps, UA_DataValue* v) {
 	if(v && (timestamps == UA_TIMESTAMPSTORETURN_SERVER || timestamps == UA_TIMESTAMPSTORETURN_BOTH)) {
-		v->hasServerTimestamp = UA_TRUE;
+		v->hasServerTimestamp = true;
 		v->serverTimestamp = UA_DateTime_now();
 	}
 }
 
 static void handleSourceTimestamps(UA_TimestampsToReturn timestamps, UA_DataValue* v) {
 	if(timestamps == UA_TIMESTAMPSTORETURN_SOURCE || timestamps == UA_TIMESTAMPSTORETURN_BOTH) {
-		v->hasSourceTimestamp = UA_TRUE;
+		v->hasSourceTimestamp = true;
 		v->sourceTimestamp = UA_DateTime_now();
 	}
 }
@@ -165,8 +165,8 @@ static UA_StatusCode getVariableNodeDataType(const UA_VariableNode *vn, UA_DataV
         /* Read from the datasource to see the data type */
         UA_DataValue val;
         UA_DataValue_init(&val);
-        val.hasValue = UA_FALSE; // always assume we are not given a value by userspace
-        retval = vn->value.dataSource.read(vn->value.dataSource.handle, vn->nodeId, UA_FALSE, NULL, &val);
+        val.hasValue = false; // always assume we are not given a value by userspace
+        retval = vn->value.dataSource.read(vn->value.dataSource.handle, vn->nodeId, false, NULL, &val);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
         if (val.hasValue && val.value.type != NULL)
@@ -188,7 +188,7 @@ static UA_StatusCode getVariableNodeArrayDimensions(const UA_VariableNode *vn, U
         /* Read the datasource to see the array dimensions */
         UA_DataValue val;
         UA_DataValue_init(&val);
-        retval = vn->value.dataSource.read(vn->value.dataSource.handle, vn->nodeId, UA_FALSE, NULL, &val);
+        retval = vn->value.dataSource.read(vn->value.dataSource.handle, vn->nodeId, false, NULL, &val);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
         retval = UA_Variant_setArrayCopy(&v->value, val.value.arrayDimensions,
@@ -206,28 +206,28 @@ static const UA_String binEncoding = {sizeof("DefaultBinary")-1, (UA_Byte*)"Defa
 void Service_Read_single(UA_Server *server, UA_Session *session, const UA_TimestampsToReturn timestamps,
                          const UA_ReadValueId *id, UA_DataValue *v) {
 	if(id->dataEncoding.name.length > 0 && !UA_String_equal(&binEncoding, &id->dataEncoding.name)) {
-           v->hasStatus = UA_TRUE;
+           v->hasStatus = true;
            v->status = UA_STATUSCODE_BADDATAENCODINGINVALID;
            return;
 	}
 
 	//index range for a non-value
 	if(id->indexRange.length > 0 && id->attributeId != UA_ATTRIBUTEID_VALUE){
-		v->hasStatus = UA_TRUE;
+		v->hasStatus = true;
 		v->status = UA_STATUSCODE_BADINDEXRANGENODATA;
 		return;
 	}
 
     UA_Node const *node = UA_NodeStore_get(server->nodestore, &id->nodeId);
     if(!node) {
-        v->hasStatus = UA_TRUE;
+        v->hasStatus = true;
         v->status = UA_STATUSCODE_BADNODEIDUNKNOWN;
         return;
     }
 
     /* When setting the value fails in the switch, we get an error code and set hasValue to false */
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    v->hasValue = UA_TRUE;
+    v->hasValue = true;
     switch(id->attributeId) {
     case UA_ATTRIBUTEID_NODEID:
         forceVariantSetScalar(&v->value, &node->nodeId, &UA_TYPES[UA_TYPES_NODEID]);
@@ -329,8 +329,8 @@ void Service_Read_single(UA_Server *server, UA_Session *session, const UA_Timest
     }
 
     if(retval != UA_STATUSCODE_GOOD) {
-        v->hasValue = UA_FALSE;
-        v->hasStatus = UA_TRUE;
+        v->hasValue = false;
+        v->hasStatus = true;
         v->status = retval;
     }
 
@@ -369,13 +369,13 @@ void Service_Read(UA_Server *server, UA_Session *session, const UA_ReadRequest *
 #ifdef UA_ENABLE_EXTERNAL_NAMESPACES
     UA_Boolean isExternal[size];
     UA_UInt32 indices[size];
-    memset(isExternal, UA_FALSE, sizeof(UA_Boolean) * size);
+    memset(isExternal, false, sizeof(UA_Boolean) * size);
     for(size_t j = 0;j<server->externalNamespacesSize;j++) {
         size_t indexSize = 0;
         for(size_t i = 0;i < size;i++) {
             if(request->nodesToRead[i].nodeId.namespaceIndex != server->externalNamespaces[j].index)
                 continue;
-            isExternal[i] = UA_TRUE;
+            isExternal[i] = true;
             indices[indexSize] = i;
             indexSize++;
         }
@@ -383,7 +383,7 @@ void Service_Read(UA_Server *server, UA_Session *session, const UA_ReadRequest *
             continue;
         UA_ExternalNodeStore *ens = &server->externalNamespaces[j].externalNodeStore;
         ens->readNodes(ens->ensHandle, &request->requestHeader, request->nodesToRead,
-                       indices, indexSize, response->results, UA_FALSE, response->diagnosticInfos);
+                       indices, indexSize, response->results, false, response->diagnosticInfos);
     }
 #endif
 
@@ -716,14 +716,14 @@ void Service_Write(UA_Server *server, UA_Session *session, const UA_WriteRequest
 #ifdef UA_ENABLE_EXTERNAL_NAMESPACES
     UA_Boolean isExternal[request->nodesToWriteSize];
     UA_UInt32 indices[request->nodesToWriteSize];
-    memset(isExternal, UA_FALSE, sizeof(UA_Boolean)*request->nodesToWriteSize);
+    memset(isExternal, false, sizeof(UA_Boolean)*request->nodesToWriteSize);
     for(size_t j = 0; j < server->externalNamespacesSize; j++) {
         UA_UInt32 indexSize = 0;
         for(size_t i = 0; i < request->nodesToWriteSize; i++) {
             if(request->nodesToWrite[i].nodeId.namespaceIndex !=
                server->externalNamespaces[j].index)
                 continue;
-            isExternal[i] = UA_TRUE;
+            isExternal[i] = true;
             indices[indexSize] = i;
             indexSize++;
         }

+ 2 - 2
src/server/ua_services_call.c

@@ -10,7 +10,7 @@ getArgumentsVariableNode(UA_Server *server, const UA_MethodNode *ofMethod,
                          UA_String withBrowseName) {
     UA_NodeId hasProperty = UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY);
     for(size_t i = 0; i < ofMethod->referencesSize; i++) {
-        if(ofMethod->references[i].isInverse == UA_FALSE && 
+        if(ofMethod->references[i].isInverse == false && 
             UA_NodeId_equal(&hasProperty, &ofMethod->references[i].referenceTypeId)) {
             const UA_Node *refTarget =
                 UA_NodeStore_get(server->nodestore, &ofMethod->references[i].targetId.nodeId);
@@ -149,7 +149,7 @@ Service_Call_single(UA_Server *server, UA_Session *session, const UA_CallMethodR
         return;
         
     /* Verify method executable */
-    if(methodCalled->executable == UA_FALSE || methodCalled->userExecutable == UA_FALSE) {
+    if(!methodCalled->executable || !methodCalled->userExecutable) {
         result->statusCode = UA_STATUSCODE_BADNOTWRITABLE; // There is no NOTEXECUTABLE?
         return;
     }

+ 5 - 5
src/server/ua_services_discovery.c

@@ -43,10 +43,10 @@ void Service_GetEndpoints(UA_Server *server, UA_Session *session, const UA_GetEn
                           UA_GetEndpointsResponse *response) {
     /* Test if one of the networklayers exposes the discoveryUrl of the requested endpoint */
     /* Disabled, servers in a virtualbox don't know their external hostname */
-    /* UA_Boolean foundUri = UA_FALSE; */
+    /* UA_Boolean foundUri = false; */
     /* for(size_t i = 0; i < server->config.networkLayersSize; i++) { */
     /*     if(UA_String_equal(&request->endpointUrl, &server->config.networkLayers[i].discoveryUrl)) { */
-    /*         foundUri = UA_TRUE; */
+    /*         foundUri = true; */
     /*         break; */
     /*     } */
     /* } */
@@ -63,15 +63,15 @@ void Service_GetEndpoints(UA_Server *server, UA_Session *session, const UA_GetEn
 #endif
     size_t relevant_count = 0;
     for(size_t j = 0; j < server->endpointDescriptionsSize; j++) {
-        relevant_endpoints[j] = UA_FALSE;
+        relevant_endpoints[j] = false;
         if(request->profileUrisSize == 0) {
-            relevant_endpoints[j] = UA_TRUE;
+            relevant_endpoints[j] = true;
             relevant_count++;
             continue;
         }
         for(size_t i = 0; i < request->profileUrisSize; i++) {
             if(UA_String_equal(&request->profileUris[i], &server->endpointDescriptions->transportProfileUri)) {
-                relevant_endpoints[j] = UA_TRUE;
+                relevant_endpoints[j] = true;
                 relevant_count++;
                 break;
             }

+ 17 - 17
src/server/ua_services_nodemanagement.c

@@ -41,7 +41,7 @@ UA_Server_addExistingNode(UA_Server *server, UA_Session *session, UA_Node *node,
         return;
     }
 
-    if(referenceType->isAbstract == UA_TRUE) {
+    if(referenceType->isAbstract == true) {
         result->statusCode = UA_STATUSCODE_BADREFERENCENOTALLOWED;
         UA_NodeStore_deleteNode(node);
         return;
@@ -60,7 +60,7 @@ UA_Server_addExistingNode(UA_Server *server, UA_Session *session, UA_Node *node,
     UA_AddReferencesItem_init(&item);
     item.sourceNodeId = node->nodeId;
     item.referenceTypeId = *referenceTypeId;
-    item.isForward = UA_FALSE;
+    item.isForward = false;
     item.targetNodeId.nodeId = *parentNodeId;
     Service_AddReferences_single(server, session, &item);
     // todo: error handling. remove new node from nodestore
@@ -220,7 +220,7 @@ instantiateObjectNode(UA_Server *server, UA_Session *session,
     UA_BrowseDescription_init(&browseChildren);
     browseChildren.nodeId = *typeId;
     browseChildren.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_AGGREGATES);
-    browseChildren.includeSubtypes = UA_TRUE;
+    browseChildren.includeSubtypes = true;
     browseChildren.browseDirection = UA_BROWSEDIRECTION_FORWARD;
     browseChildren.nodeClassMask = UA_NODECLASS_OBJECT | UA_NODECLASS_VARIABLE | UA_NODECLASS_METHOD;
     browseChildren.resultMask = UA_BROWSERESULTMASK_REFERENCETYPEID | UA_BROWSERESULTMASK_NODECLASS;
@@ -238,7 +238,7 @@ instantiateObjectNode(UA_Server *server, UA_Session *session,
             UA_AddReferencesItem_init(&item);
             item.sourceNodeId = *nodeId;
             item.referenceTypeId = rd->referenceTypeId;
-            item.isForward = UA_TRUE;
+            item.isForward = true;
             item.targetNodeId = rd->nodeId;
             item.targetNodeClass = UA_NODECLASS_METHOD;
             Service_AddReferences_single(server, session, &item);
@@ -253,7 +253,7 @@ instantiateObjectNode(UA_Server *server, UA_Session *session,
     UA_AddReferencesItem_init(&addref);
     addref.sourceNodeId = *nodeId;
     addref.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASTYPEDEFINITION);
-    addref.isForward = UA_TRUE;
+    addref.isForward = true;
     addref.targetNodeId.nodeId = *typeId;
     addref.targetNodeClass = UA_NODECLASS_OBJECTTYPE;
     Service_AddReferences_single(server, session, &addref);
@@ -280,7 +280,7 @@ instantiateVariableNode(UA_Server *server, UA_Session *session, const UA_NodeId
     UA_BrowseDescription_init(&browseChildren);
     browseChildren.nodeId = *typeId;
     browseChildren.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY);
-    browseChildren.includeSubtypes = UA_TRUE;
+    browseChildren.includeSubtypes = true;
     browseChildren.browseDirection = UA_BROWSEDIRECTION_FORWARD;
     browseChildren.nodeClassMask = UA_NODECLASS_VARIABLE;
     browseChildren.resultMask = UA_BROWSERESULTMASK_REFERENCETYPEID | UA_BROWSERESULTMASK_NODECLASS;
@@ -301,7 +301,7 @@ instantiateVariableNode(UA_Server *server, UA_Session *session, const UA_NodeId
     UA_AddReferencesItem_init(&addref);
     addref.sourceNodeId = *nodeId;
     addref.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASTYPEDEFINITION);
-    addref.isForward = UA_TRUE;
+    addref.isForward = true;
     addref.targetNodeId.nodeId = *typeId;
     addref.targetNodeClass = UA_NODECLASS_OBJECTTYPE;
     Service_AddReferences_single(server, session, &addref);
@@ -526,7 +526,7 @@ void Service_AddNodes_single(UA_Server *server, UA_Session *session, const UA_Ad
 
     /* if instantiation failed, remove the node */
     if(result->statusCode != UA_STATUSCODE_GOOD)
-        Service_DeleteNodes_single(server, session, &result->addedNodeId, UA_TRUE);
+        Service_DeleteNodes_single(server, session, &result->addedNodeId, true);
 }
 
 void Service_AddNodes(UA_Server *server, UA_Session *session, const UA_AddNodesRequest *request,
@@ -551,14 +551,14 @@ void Service_AddNodes(UA_Server *server, UA_Session *session, const UA_AddNodesR
     UA_Boolean isExternal[size];
     UA_UInt32 indices[size];
 #endif
-    memset(isExternal, UA_FALSE, sizeof(UA_Boolean) * size);
+    memset(isExternal, false, sizeof(UA_Boolean) * size);
     for(size_t j = 0; j <server->externalNamespacesSize; j++) {
         size_t indexSize = 0;
         for(size_t i = 0;i < size;i++) {
             if(request->nodesToAdd[i].requestedNewNodeId.nodeId.namespaceIndex !=
                server->externalNamespaces[j].index)
                 continue;
-            isExternal[i] = UA_TRUE;
+            isExternal[i] = true;
             indices[indexSize] = i;
             indexSize++;
         }
@@ -811,14 +811,14 @@ void Service_AddReferences(UA_Server *server, UA_Session *session, const UA_AddR
     UA_Boolean *isExternal = UA_alloca(sizeof(UA_Boolean) * size);
     UA_UInt32 *indices = UA_alloca(sizeof(UA_UInt32) * size);
 #endif /*NO_ALLOCA */
-    memset(isExternal, UA_FALSE, sizeof(UA_Boolean) * size);
+    memset(isExternal, false, sizeof(UA_Boolean) * size);
 	for(size_t j = 0; j < server->externalNamespacesSize; j++) {
 		size_t indicesSize = 0;
 		for(size_t i = 0;i < size;i++) {
 			if(request->referencesToAdd[i].sourceNodeId.namespaceIndex
                != server->externalNamespaces[j].index)
 				continue;
-			isExternal[i] = UA_TRUE;
+			isExternal[i] = true;
 			indices[indicesSize] = i;
 			indicesSize++;
 		}
@@ -851,10 +851,10 @@ Service_DeleteNodes_single(UA_Server *server, UA_Session *session, const UA_Node
     const UA_Node *node = UA_NodeStore_get(server->nodestore, nodeId);
     if(!node)
         return UA_STATUSCODE_BADNODEIDINVALID;
-    if(deleteReferences == UA_TRUE) {
+    if(deleteReferences == true) {
         UA_DeleteReferencesItem delItem;
         UA_DeleteReferencesItem_init(&delItem);
-        delItem.deleteBidirectional = UA_FALSE;
+        delItem.deleteBidirectional = false;
         delItem.targetNodeId.nodeId = *nodeId;
         for(size_t i = 0; i < node->referencesSize; i++) {
             delItem.sourceNodeId = node->references[i].targetId.nodeId;
@@ -871,7 +871,7 @@ Service_DeleteNodes_single(UA_Server *server, UA_Session *session, const UA_Node
         bd.browseDirection = UA_BROWSEDIRECTION_INVERSE;
         bd.nodeId = *nodeId;
         bd.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE);
-        bd.includeSubtypes = UA_TRUE;
+        bd.includeSubtypes = true;
         bd.nodeClassMask = UA_NODECLASS_OBJECTTYPE;
         
         /* browse type definitions with admin rights */
@@ -923,7 +923,7 @@ void Service_DeleteNodes(UA_Server *server, UA_Session *session, const UA_Delete
 static UA_StatusCode
 deleteOneWayReference(UA_Server *server, UA_Session *session, UA_Node *node,
                       const UA_DeleteReferencesItem *item) {
-    UA_Boolean edited = UA_FALSE;
+    UA_Boolean edited = false;
     for(size_t i = node->referencesSize - 1; ; i--) {
         if(i > node->referencesSize)
             break; /* underflow after i == 0 */
@@ -937,7 +937,7 @@ deleteOneWayReference(UA_Server *server, UA_Session *session, UA_Node *node,
         UA_ReferenceNode_deleteMembers(&node->references[i]);
         node->references[i] = node->references[node->referencesSize-1];
         node->referencesSize--;
-        edited = UA_TRUE;
+        edited = true;
         break;
     }
     if(!edited)

+ 2 - 2
src/server/ua_services_session.c

@@ -108,7 +108,7 @@ Service_ActivateSession(UA_Server *server, UA_Session *session, const UA_Activat
         if(foundSession->channel && foundSession->channel != channel)
             UA_SecureChannel_detachSession(foundSession->channel, foundSession);
         UA_SecureChannel_attachSession(channel, foundSession);
-        foundSession->activated = UA_TRUE;
+        foundSession->activated = true;
         UA_Session_updateLifetime(foundSession);
         return;
     }
@@ -136,7 +136,7 @@ Service_ActivateSession(UA_Server *server, UA_Session *session, const UA_Activat
             if(foundSession->channel && foundSession->channel != channel)
                 UA_SecureChannel_detachSession(foundSession->channel, foundSession);
             UA_SecureChannel_attachSession(channel, foundSession);
-            foundSession->activated = UA_TRUE;
+            foundSession->activated = true;
             UA_Session_updateLifetime(foundSession);
             return;
         }

+ 7 - 7
src/server/ua_services_subscription.c

@@ -158,12 +158,12 @@ Service_Publish(UA_Server *server, UA_Session *session,
             response.results[i] = UA_STATUSCODE_BADSEQUENCENUMBERINVALID;
     }
     
-    UA_Boolean have_response = UA_FALSE;
+    UA_Boolean have_response = false;
 
     // See if any new data is available
     UA_Subscription *sub;
     LIST_FOREACH(sub, &manager->serverSubscriptions, listEntry) {
-        if(sub->timedUpdateIsRegistered == UA_FALSE) {
+        if(sub->timedUpdateIsRegistered == false) {
             // FIXME: We are forcing a value update for monitored items. This should be done by the event system.
             // NOTE:  There is a clone of this functionality in the Subscription_timedUpdateNotificationsJob
             UA_MonitoredItem *mon;
@@ -182,7 +182,7 @@ Service_Publish(UA_Server *server, UA_Session *session,
         // Due to republish, we need to check if there are any unplublished notifications first ()
         UA_unpublishedNotification *notification = NULL;
         LIST_FOREACH(notification, &sub->unpublishedNotifications, listEntry) {
-            if (notification->publishedOnce == UA_FALSE)
+            if (notification->publishedOnce == false)
                 break;
         }
         if (notification == NULL)
@@ -192,7 +192,7 @@ Service_Publish(UA_Server *server, UA_Session *session,
         response.subscriptionId = sub->subscriptionID;
         Subscription_copyNotificationMessage(&response.notificationMessage, notification);
         // Mark this notification as published
-        notification->publishedOnce = UA_TRUE;
+        notification->publishedOnce = true;
         if(notification->notification.sequenceNumber > sub->sequenceNumber) {
             // If this is a keepalive message, its seqNo is the next seqNo to be used for an actual msg.
             response.availableSequenceNumbersSize = 0;
@@ -202,7 +202,7 @@ Service_Publish(UA_Server *server, UA_Session *session,
             response.availableSequenceNumbersSize = sub->unpublishedNotificationsSize;
             response.availableSequenceNumbers = Subscription_getAvailableSequenceNumbers(sub);
         }	  
-        have_response = UA_TRUE;
+        have_response = true;
     }
     
     if(!have_response) {
@@ -327,7 +327,7 @@ void Service_Republish(UA_Server *server, UA_Session *session,
     //        true. If this is not tested, the client just gets what he asks for... hence this part is
     //        commented:
     /* Check if the notification is in the published queue
-    if (notification->publishedOnce == UA_FALSE) {
+    if (notification->publishedOnce == false) {
       response->responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
       return;
     }
@@ -335,7 +335,7 @@ void Service_Republish(UA_Server *server, UA_Session *session,
     // Retransmit 
     Subscription_copyNotificationMessage(&response->notificationMessage, notification);
     // Mark this notification as published
-    notification->publishedOnce = UA_TRUE;
+    notification->publishedOnce = true;
     
     return;
 }

+ 16 - 16
src/server/ua_services_view.c

@@ -55,7 +55,7 @@ returnRelevantNodeExternal(UA_ExternalNodeStore *ens, const UA_BrowseDescription
     readValueIds[5].attributeId = UA_ATTRIBUTEID_USERWRITEMASK;
 
     ens->readNodes(ens->ensHandle, NULL, readValueIds, indices,
-                   indicesSize, readNodesResults, UA_FALSE, diagnosticInfos);
+                   indicesSize, readNodesResults, false, diagnosticInfos);
 
     /* create and fill a dummy nodeStructure */
     UA_Node *node = (UA_Node*) UA_NodeStore_newObjectNode();
@@ -98,10 +98,10 @@ returnRelevantNode(UA_Server *server, const UA_BrowseDescription *descr, UA_Bool
 
     /* is the reference part of the hierarchy of references we look for? */
     if(!return_all) {
-        UA_Boolean is_relevant = UA_FALSE;
+        UA_Boolean is_relevant = false;
         for(size_t i = 0; i < relevant_count; i++) {
             if(UA_NodeId_equal(&reference->referenceTypeId, &relevant[i])) {
-                is_relevant = UA_TRUE;
+                is_relevant = true;
                 break;
             }
         }
@@ -114,7 +114,7 @@ returnRelevantNode(UA_Server *server, const UA_BrowseDescription *descr, UA_Bool
 	for(size_t nsIndex = 0; nsIndex < server->externalNamespacesSize; nsIndex++) {
 		if(reference->targetId.nodeId.namespaceIndex != server->externalNamespaces[nsIndex].index)
 			continue;
-        *isExternal = UA_TRUE;
+        *isExternal = true;
         return returnRelevantNodeExternal(&server->externalNamespaces[nsIndex].externalNodeStore,
                                           descr, reference);
     }
@@ -124,7 +124,7 @@ returnRelevantNode(UA_Server *server, const UA_BrowseDescription *descr, UA_Bool
     const UA_Node *node = UA_NodeStore_get(server->nodestore, &reference->targetId.nodeId);
     if(node && descr->nodeClassMask != 0 && (node->nodeClass & descr->nodeClassMask) == 0)
         return NULL;
-    *isExternal = UA_FALSE;
+    *isExternal = false;
     return node;
 }
 
@@ -161,7 +161,7 @@ findSubTypes(UA_NodeStore *ns, const UA_NodeId *root, UA_NodeId **reftypes, size
             continue;
         for(size_t i = 0; i < node->referencesSize; i++) {
             if(node->references[i].referenceTypeId.identifier.numeric != UA_NS0ID_HASSUBTYPE ||
-               node->references[i].isInverse == UA_TRUE)
+               node->references[i].isInverse == true)
                 continue;
 
             if(++last >= results_size) { // is the array big enough?
@@ -285,10 +285,10 @@ Service_Browse_single(UA_Server *server, UA_Session *session, struct Continuatio
 
     /* loop over the node's references */
     size_t skipped = 0;
-    UA_Boolean isExternal = UA_FALSE;
+    UA_Boolean isExternal = false;
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     for(; referencesIndex < node->referencesSize && referencesCount < real_maxrefs; referencesIndex++) {
-    	isExternal = UA_FALSE;
+    	isExternal = false;
     	const UA_Node *current =
             returnRelevantNode(server, descr, all_refs, &node->references[referencesIndex],
                                relevant_refs, relevant_refs_size, &isExternal);
@@ -305,7 +305,7 @@ Service_Browse_single(UA_Server *server, UA_Session *session, struct Continuatio
 #ifdef UA_ENABLE_EXTERNAL_NAMESPACES
         /* relevant_node returns a node malloced by the nodestore.
            if it is external (there is no UA_Node_new function) */
-   //     if(isExternal == UA_TRUE)
+   //     if(isExternal == true)
    //         UA_Node_deleteMembersAnyNodeClass(current);
    //TODO something's wrong here...
 #endif
@@ -393,13 +393,13 @@ void Service_Browse(UA_Server *server, UA_Session *session, const UA_BrowseReque
     UA_Boolean *isExternal = UA_alloca(sizeof(UA_Boolean) * size);
     UA_UInt32 *indices = UA_alloca(sizeof(UA_UInt32) * size);
 #endif /*NO_ALLOCA */
-    memset(isExternal, UA_FALSE, sizeof(UA_Boolean) * size);
+    memset(isExternal, false, sizeof(UA_Boolean) * size);
     for(size_t j = 0; j < server->externalNamespacesSize; j++) {
         size_t indexSize = 0;
         for(size_t i = 0; i < size; i++) {
             if(request->nodesToBrowse[i].nodeId.namespaceIndex != server->externalNamespaces[j].index)
                 continue;
-            isExternal[i] = UA_TRUE;
+            isExternal[i] = true;
             indices[indexSize] = i;
             indexSize++;
         }
@@ -471,9 +471,9 @@ walkBrowsePath(UA_Server *server, UA_Session *session, const UA_Node *node, cons
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_NodeId *reftypes = NULL;
     size_t reftypes_count = 1; // all_refs or no subtypes => 1
-    UA_Boolean all_refs = UA_FALSE;
+    UA_Boolean all_refs = false;
     if(UA_NodeId_isNull(&elem->referenceTypeId))
-        all_refs = UA_TRUE;
+        all_refs = true;
     else if(!elem->includeSubtypes)
         reftypes = (UA_NodeId*)(uintptr_t)&elem->referenceTypeId; // ptr magic due to const cast
     else {
@@ -487,7 +487,7 @@ walkBrowsePath(UA_Server *server, UA_Session *session, const UA_Node *node, cons
         for(size_t j = 0; j < reftypes_count && !match; j++) {
             if(node->references[i].isInverse == elem->isInverse &&
                UA_NodeId_equal(&node->references[i].referenceTypeId, &reftypes[j]))
-                match = UA_TRUE;
+                match = true;
         }
         if(!match)
             continue;
@@ -593,13 +593,13 @@ void Service_TranslateBrowsePathsToNodeIds(UA_Server *server, UA_Session *sessio
     UA_Boolean *isExternal = UA_alloca(sizeof(UA_Boolean) * size);
     UA_UInt32 *indices = UA_alloca(sizeof(UA_UInt32) * size);
 #endif /*NO_ALLOCA */
-    memset(isExternal, UA_FALSE, sizeof(UA_Boolean) * size);
+    memset(isExternal, false, sizeof(UA_Boolean) * size);
     for(size_t j = 0; j < server->externalNamespacesSize; j++) {
     	size_t indexSize = 0;
     	for(size_t i = 0;i < size;i++) {
     		if(request->browsePaths[i].startingNode.namespaceIndex != server->externalNamespaces[j].index)
     			continue;
-    		isExternal[i] = UA_TRUE;
+    		isExternal[i] = true;
     		indices[indexSize] = i;
     		indexSize++;
     	}

+ 27 - 27
src/server/ua_subscription.c

@@ -15,7 +15,7 @@ UA_Subscription *UA_Subscription_new(UA_UInt32 subscriptionID) {
     new->sequenceNumber = 1;
     memset(&new->timedUpdateJobGuid, 0, sizeof(UA_Guid));
     new->timedUpdateJob          = NULL;
-    new->timedUpdateIsRegistered = UA_FALSE;
+    new->timedUpdateIsRegistered = false;
     LIST_INIT(&new->MonitoredItems);
     LIST_INIT(&new->unpublishedNotifications);
     new->unpublishedNotificationsSize = 0;
@@ -243,12 +243,12 @@ UA_StatusCode Subscription_registerUpdateJob(UA_Server *server, UA_Subscription
                                                     (UA_UInt32)sub->publishingInterval,
                                                     &sub->timedUpdateJobGuid);
     if(retval == UA_STATUSCODE_GOOD)
-        sub->timedUpdateIsRegistered = UA_TRUE;
+        sub->timedUpdateIsRegistered = true;
     return retval;
 }
 
 UA_StatusCode Subscription_unregisterUpdateJob(UA_Server *server, UA_Subscription *sub) {
-    sub->timedUpdateIsRegistered = UA_FALSE;
+    sub->timedUpdateIsRegistered = false;
     return UA_Server_removeRepeatedJob(server, sub->timedUpdateJobGuid);
 }
 
@@ -292,8 +292,8 @@ UA_UInt32 MonitoredItem_QueueToDataChangeNotifications(UA_MonitoredItemNotificat
         dst[queueSize].clientHandle = monitoredItem->clientHandle;
         UA_DataValue_copy(&queueItem->value, &dst[queueSize].value);
 
-        dst[queueSize].value.hasServerPicoseconds = UA_FALSE;
-        dst[queueSize].value.hasServerTimestamp   = UA_TRUE;
+        dst[queueSize].value.hasServerPicoseconds = false;
+        dst[queueSize].value.hasServerTimestamp   = true;
         dst[queueSize].value.serverTimestamp      = UA_DateTime_now();
     
         // Do not create variants with no type -> will make calcSizeBinary() segfault.
@@ -315,7 +315,7 @@ void MonitoredItem_ClearQueue(UA_MonitoredItem *monitoredItem) {
 
 UA_Boolean MonitoredItem_CopyMonitoredValueToVariant(UA_UInt32 attributeID, const UA_Node *src,
                                                      UA_DataValue *dst) {
-    UA_Boolean samplingError = UA_TRUE; 
+    UA_Boolean samplingError = true; 
     UA_DataValue sourceDataValue;
     UA_DataValue_init(&sourceDataValue);
   
@@ -323,38 +323,38 @@ UA_Boolean MonitoredItem_CopyMonitoredValueToVariant(UA_UInt32 attributeID, cons
     switch(attributeID) {
     case UA_ATTRIBUTEID_NODEID:
         UA_Variant_setScalarCopy(&dst->value, (const UA_NodeId*)&src->nodeId, &UA_TYPES[UA_TYPES_NODEID]);
-        dst->hasValue = UA_TRUE;
-        samplingError = UA_FALSE;
+        dst->hasValue = true;
+        samplingError = false;
         break;
     case UA_ATTRIBUTEID_NODECLASS:
         UA_Variant_setScalarCopy(&dst->value, (const UA_Int32*)&src->nodeClass, &UA_TYPES[UA_TYPES_INT32]);
-        dst->hasValue = UA_TRUE;
-        samplingError = UA_FALSE;
+        dst->hasValue = true;
+        samplingError = false;
         break;
     case UA_ATTRIBUTEID_BROWSENAME:
         UA_Variant_setScalarCopy(&dst->value, (const UA_String*)&src->browseName, &UA_TYPES[UA_TYPES_QUALIFIEDNAME]);
-        dst->hasValue = UA_TRUE;
-        samplingError = UA_FALSE;
+        dst->hasValue = true;
+        samplingError = false;
         break;
     case UA_ATTRIBUTEID_DISPLAYNAME:
         UA_Variant_setScalarCopy(&dst->value, (const UA_String*)&src->displayName, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-        dst->hasValue = UA_TRUE;
-        samplingError = UA_FALSE;
+        dst->hasValue = true;
+        samplingError = false;
         break;
     case UA_ATTRIBUTEID_DESCRIPTION:
         UA_Variant_setScalarCopy(&dst->value, (const UA_String*)&src->displayName, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-        dst->hasValue = UA_TRUE;
-        samplingError = UA_FALSE;
+        dst->hasValue = true;
+        samplingError = false;
         break;
     case UA_ATTRIBUTEID_WRITEMASK:
         UA_Variant_setScalarCopy(&dst->value, (const UA_String*)&src->writeMask, &UA_TYPES[UA_TYPES_UINT32]);
-        dst->hasValue = UA_TRUE;
-        samplingError = UA_FALSE;
+        dst->hasValue = true;
+        samplingError = false;
         break;
     case UA_ATTRIBUTEID_USERWRITEMASK:
         UA_Variant_setScalarCopy(&dst->value, (const UA_String*)&src->writeMask, &UA_TYPES[UA_TYPES_UINT32]);
-        dst->hasValue = UA_TRUE;
-        samplingError = UA_FALSE;
+        dst->hasValue = true;
+        samplingError = false;
         break;
     case UA_ATTRIBUTEID_ISABSTRACT:
         break;
@@ -374,17 +374,17 @@ UA_Boolean MonitoredItem_CopyMonitoredValueToVariant(UA_UInt32 attributeID, cons
                     vsrc->value.variant.callback.onRead(vsrc->value.variant.callback.handle, vsrc->nodeId,
                                                         &dst->value, NULL);
                 UA_Variant_copy(&vsrc->value.variant.value, &dst->value);
-                dst->hasValue = UA_TRUE;
-                samplingError = UA_FALSE;
+                dst->hasValue = true;
+                samplingError = false;
             } else {
                 if(vsrc->valueSource != UA_VALUESOURCE_DATASOURCE || vsrc->value.dataSource.read == NULL)
                     break;
-                if(vsrc->value.dataSource.read(vsrc->value.dataSource.handle, vsrc->nodeId, UA_TRUE,
+                if(vsrc->value.dataSource.read(vsrc->value.dataSource.handle, vsrc->nodeId, true,
                                                NULL, &sourceDataValue) != UA_STATUSCODE_GOOD)
                     break;
                 UA_DataValue_copy(&sourceDataValue, dst);
                 UA_DataValue_deleteMembers(&sourceDataValue);
-                samplingError = UA_FALSE;
+                samplingError = false;
             }
         }
         break;
@@ -445,14 +445,14 @@ void MonitoredItem_QueuePushDataValue(UA_Server *server, UA_MonitoredItem *monit
     UA_Boolean samplingError = MonitoredItem_CopyMonitoredValueToVariant(monitoredItem->attributeID, target,
                                                                          &newvalue->value);
 
-    if(samplingError != UA_FALSE || !newvalue->value.value.type) {
+    if(samplingError != false || !newvalue->value.value.type) {
         UA_DataValue_deleteMembers(&newvalue->value);
         UA_free(newvalue);
         return;
     }
   
     if(monitoredItem->queueSize.currentValue >= monitoredItem->queueSize.maxValue) {
-        if(monitoredItem->discardOldest != UA_TRUE) {
+        if(monitoredItem->discardOldest != true) {
             // We cannot remove the oldest value and theres no queue space left. We're done here.
             UA_DataValue_deleteMembers(&newvalue->value);
             UA_free(newvalue);
@@ -488,7 +488,7 @@ void MonitoredItem_QueuePushDataValue(UA_Server *server, UA_MonitoredItem *monit
         monitoredItem->lastSampled = UA_DateTime_now();
         UA_free(newValueAsByteString.data);
     } else {
-        if(UA_String_equal(&newValueAsByteString, &monitoredItem->lastSampledValue) == UA_TRUE) {
+        if(UA_String_equal(&newValueAsByteString, &monitoredItem->lastSampledValue) == true) {
             UA_DataValue_deleteMembers(&newvalue->value);
             UA_free(newvalue);
             UA_String_deleteMembers(&newValueAsByteString);

+ 5 - 5
src/ua_connection.c

@@ -33,7 +33,7 @@ UA_StatusCode
 UA_Connection_completeMessages(UA_Connection *connection, UA_ByteString * UA_RESTRICT message,
                               UA_Boolean * UA_RESTRICT realloced) {
     UA_ByteString *current = message;
-    *realloced = UA_FALSE;
+    *realloced = false;
     if(connection->incompleteMessage.length > 0) {
         /* concat the existing incomplete message with the new message */
         UA_Byte *data = UA_realloc(connection->incompleteMessage.data,
@@ -49,7 +49,7 @@ UA_Connection_completeMessages(UA_Connection *connection, UA_ByteString * UA_RES
         connection->incompleteMessage.length += message->length;
         connection->releaseRecvBuffer(connection, message);
         current = &connection->incompleteMessage;
-        *realloced = UA_TRUE;
+        *realloced = true;
     }
 
     /* the while loop sets pos to the first element after the last complete message. if a message
@@ -86,7 +86,7 @@ UA_Connection_completeMessages(UA_Connection *connection, UA_ByteString * UA_RES
     if(delete_at == 0) {
         if(!*realloced) {
             connection->releaseRecvBuffer(connection, message);
-            *realloced = UA_TRUE;
+            *realloced = true;
         } else
             UA_ByteString_deleteMembers(current);
         return UA_STATUSCODE_GOOD;
@@ -98,7 +98,7 @@ UA_Connection_completeMessages(UA_Connection *connection, UA_ByteString * UA_RES
             /* store the buffer in the connection */
             UA_ByteString_copy(current, &connection->incompleteMessage);
             connection->releaseRecvBuffer(connection, message);
-            *realloced = UA_TRUE;
+            *realloced = true;
         } 
         return UA_STATUSCODE_GOOD;
     }
@@ -110,7 +110,7 @@ UA_Connection_completeMessages(UA_Connection *connection, UA_ByteString * UA_RES
             UA_ByteString_deleteMembers(&connection->incompleteMessage);
             if(!*realloced) {
                 connection->releaseRecvBuffer(connection, message);
-                *realloced = UA_TRUE;
+                *realloced = true;
             }
             return UA_STATUSCODE_BADOUTOFMEMORY;
         }

+ 1 - 1
src/ua_session.c

@@ -18,7 +18,7 @@ UA_Session adminSession = {
 
 void UA_Session_init(UA_Session *session) {
     UA_ApplicationDescription_init(&session->clientDescription);
-    session->activated = UA_FALSE;
+    session->activated = false;
     UA_NodeId_init(&session->authenticationToken);
     UA_NodeId_init(&session->sessionId);
     UA_String_init(&session->sessionName);

+ 13 - 13
src/ua_types.c

@@ -48,9 +48,9 @@ UA_String UA_String_fromChars(char const src[]) {
 
 UA_Boolean UA_String_equal(const UA_String *string1, const UA_String *string2) {
     if(string1->length != string2->length)
-        return UA_FALSE;
+        return false;
     UA_Int32 is = memcmp((char const*)string1->data, (char const*)string2->data, string1->length);
-    return (is == 0) ? UA_TRUE : UA_FALSE;
+    return (is == 0) ? true : false;
 }
 
 /* DateTime */
@@ -156,8 +156,8 @@ UA_String UA_DateTime_toString(UA_DateTime t) {
 /* Guid */
 UA_Boolean UA_Guid_equal(const UA_Guid *g1, const UA_Guid *g2) {
     if(memcmp(g1, g2, sizeof(UA_Guid)) == 0)
-        return UA_TRUE;
-    return UA_FALSE;
+        return true;
+    return false;
 }
 
 UA_Guid UA_Guid_random(void) {
@@ -226,13 +226,13 @@ static UA_StatusCode NodeId_copy(UA_NodeId const *src, UA_NodeId *dst, const UA_
 
 UA_Boolean UA_NodeId_equal(const UA_NodeId *n1, const UA_NodeId *n2) {
 	if(n1->namespaceIndex != n2->namespaceIndex || n1->identifierType!=n2->identifierType)
-        return UA_FALSE;
+        return false;
     switch(n1->identifierType) {
     case UA_NODEIDTYPE_NUMERIC:
         if(n1->identifier.numeric == n2->identifier.numeric)
-            return UA_TRUE;
+            return true;
         else
-            return UA_FALSE;
+            return false;
     case UA_NODEIDTYPE_STRING:
         return UA_String_equal(&n1->identifier.string, &n2->identifier.string);
     case UA_NODEIDTYPE_GUID:
@@ -240,7 +240,7 @@ UA_Boolean UA_NodeId_equal(const UA_NodeId *n1, const UA_NodeId *n2) {
     case UA_NODEIDTYPE_BYTESTRING:
         return UA_ByteString_equal(&n1->identifier.byteString, &n2->identifier.byteString);
     }
-    return UA_FALSE;
+    return false;
 }
 
 /* ExpandedNodeId */
@@ -391,10 +391,10 @@ processRangeDefinition(const UA_Variant *v, const UA_NumericRange range, size_t
     /* Compute the stride length and the position of the first element */
     size_t b = 1, s = elements, f = 0;
     size_t running_dimssize = 1;
-    UA_Boolean found_contiguous = UA_FALSE;
+    UA_Boolean found_contiguous = false;
     for(size_t k = dims_count - 1; ; k--) {
         if(!found_contiguous && (range.dimensions[k].min != 0 || range.dimensions[k].max + 1 != dims[k])) {
-            found_contiguous = UA_TRUE;
+            found_contiguous = true;
             b = (range.dimensions[k].max - range.dimensions[k].min + 1) * running_dimssize;
             s = dims[k] * running_dimssize;
         } 
@@ -602,7 +602,7 @@ static void DiagnosticInfo_deleteMembers(UA_DiagnosticInfo *p, const UA_DataType
         DiagnosticInfo_deleteMembers(p->innerDiagnosticInfo, NULL);
         UA_free(p->innerDiagnosticInfo);
         p->innerDiagnosticInfo = NULL;
-        p->hasInnerDiagnosticInfo = UA_FALSE;
+        p->hasInnerDiagnosticInfo = false;
     }
 }
 
@@ -617,9 +617,9 @@ DiagnosticInfo_copy(UA_DiagnosticInfo const *src, UA_DiagnosticInfo *dst, const
     if(src->hasInnerDiagnosticInfo && src->innerDiagnosticInfo) {
         if((dst->innerDiagnosticInfo = UA_malloc(sizeof(UA_DiagnosticInfo)))) {
             retval |= DiagnosticInfo_copy(src->innerDiagnosticInfo, dst->innerDiagnosticInfo, NULL);
-            dst->hasInnerDiagnosticInfo = UA_TRUE;
+            dst->hasInnerDiagnosticInfo = true;
         } else {
-            dst->hasInnerDiagnosticInfo = UA_FALSE;
+            dst->hasInnerDiagnosticInfo = false;
             retval |= UA_STATUSCODE_BADOUTOFMEMORY;
         }
     }

+ 2 - 2
src/ua_types_encoding_binary.c

@@ -38,7 +38,7 @@ static UA_StatusCode
 Boolean_decodeBinary(bufpos pos, bufend end, UA_Boolean *dst) {
     if(*pos + sizeof(UA_Boolean) > end)
         return UA_STATUSCODE_BADDECODINGERROR;
-    *dst = (**pos > 0) ? UA_TRUE : UA_FALSE;
+    *dst = (**pos > 0) ? true : false;
     (*pos)++;
     return UA_STATUSCODE_GOOD;
 }
@@ -962,7 +962,7 @@ DiagnosticInfo_decodeBinary(bufpos pos, bufend end, UA_DiagnosticInfo *dst) {
         if(dst->innerDiagnosticInfo)
             retval |= DiagnosticInfo_decodeBinary(pos, end, dst->innerDiagnosticInfo);
         else {
-            dst->hasInnerDiagnosticInfo = UA_FALSE;
+            dst->hasInnerDiagnosticInfo = false;
             retval |= UA_STATUSCODE_BADOUTOFMEMORY;
         }
     }

+ 2 - 2
src/ua_util.h

@@ -109,11 +109,11 @@ int gettimeofday(struct timeval *tp, struct timezone *tzp);
 #   define UA_ASSERT_RCU_UNLOCKED() assert(!rcu_locked)
 #   define UA_RCU_LOCK() do {                     \
         UA_ASSERT_RCU_UNLOCKED();                 \
-        rcu_locked = UA_TRUE;                     \
+        rcu_locked = true;                        \
         rcu_read_lock(); } while(0)
 #   define UA_RCU_UNLOCK() do {                   \
         UA_ASSERT_RCU_LOCKED();                   \
-        rcu_locked = UA_FALSE;                    \
+        rcu_locked = false;                       \
         rcu_read_lock(); } while(0)
 # endif
 #else

+ 1 - 1
src_extra/networklayer_tcp.c

@@ -422,7 +422,7 @@ ServerNetworkLayerTCP_getJobs(UA_ServerNetworkLayer *nl, UA_Job **jobs, UA_UInt1
             continue;
         UA_StatusCode retval = socket_recv(layer->mappings[i].connection, &buf, 0);
         if(retval == UA_STATUSCODE_GOOD) {
-            UA_Boolean realloced = UA_FALSE;
+            UA_Boolean realloced = false;
             retval = UA_Connection_completeMessages(layer->mappings[i].connection, &buf, &realloced);
             if(retval != UA_STATUSCODE_GOOD || buf.length == 0)
                 continue;

+ 8 - 8
tests/check_builtin.c

@@ -912,7 +912,7 @@ START_TEST(UA_DataValue_encodeShallWorkOnExampleWithoutVariant) {
     UA_DataValue src;
     UA_DataValue_init(&src);
     src.serverTimestamp = 80;
-    src.hasServerTimestamp = UA_TRUE;
+    src.hasServerTimestamp = true;
 
     UA_Byte data[] = { 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
                        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
@@ -945,8 +945,8 @@ START_TEST(UA_DataValue_encodeShallWorkOnExampleWithVariant) {
     UA_DataValue src;
     UA_DataValue_init(&src);
     src.serverTimestamp    = 80;
-    src.hasValue = UA_TRUE;
-    src.hasServerTimestamp = UA_TRUE;
+    src.hasValue = true;
+    src.hasServerTimestamp = true;
     src.value.type = &UA_TYPES[UA_TYPES_INT32];
     src.value.arrayLength  = 0; // one element (encoded as not an array)
     UA_Int32 vdata = 45;
@@ -1114,9 +1114,9 @@ START_TEST(UA_DiagnosticInfo_copyShallWorkOnExample) {
 
     UA_DiagnosticInfo_init(&value);
     UA_DiagnosticInfo_init(&innerValue);
-    value.hasInnerDiagnosticInfo = UA_TRUE;
+    value.hasInnerDiagnosticInfo = true;
     value.innerDiagnosticInfo = &innerValue;
-    value.hasAdditionalInfo = UA_TRUE;
+    value.hasAdditionalInfo = true;
     value.additionalInfo = testString;
 
     //when
@@ -1253,11 +1253,11 @@ START_TEST(UA_DataValue_copyShallWorkOnInputExample) {
     UA_Variant_init(&srcVariant);
     UA_DataValue src;
     UA_DataValue_init(&src);
-    src.hasSourceTimestamp = UA_TRUE;
+    src.hasSourceTimestamp = true;
     src.sourceTimestamp = 4;
-    src.hasSourcePicoseconds = UA_TRUE;
+    src.hasSourcePicoseconds = true;
     src.sourcePicoseconds = 77;
-    src.hasServerPicoseconds = UA_TRUE;
+    src.hasServerPicoseconds = true;
     src.serverPicoseconds = 8;
     UA_DataValue dst;
 

+ 1 - 1
tests/check_memory.c

@@ -74,7 +74,7 @@ START_TEST(encodeShallYieldDecode) {
 	ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
 	// then
-	ck_assert_msg(UA_ByteString_equal(&msg1, &msg2) == UA_TRUE, "messages differ idx=%d,nodeid=%i", _i,
+	ck_assert_msg(UA_ByteString_equal(&msg1, &msg2) == true, "messages differ idx=%d,nodeid=%i", _i,
                   UA_TYPES[_i].typeId.identifier.numeric);
 
 	// finally

+ 37 - 37
tests/check_services_attributes.c

@@ -22,7 +22,7 @@ UA_StatusCode readCPUTemperature_broken(void *handle, const UA_NodeId nodeid, UA
 UA_StatusCode readCPUTemperature_broken(void *handle, const UA_NodeId nodeid, UA_Boolean sourceTimeStamp,
                                         const UA_NumericRange *range, UA_DataValue *dataValue) 
 {
-  dataValue->hasValue = UA_TRUE;
+  dataValue->hasValue = true;
   return UA_STATUSCODE_GOOD;
 }
 
@@ -341,7 +341,7 @@ START_TEST(ReadSingleAttributeIsAbstractWithoutTimestamp) {
     Service_Read_single(server, &adminSession, UA_TIMESTAMPSTORETURN_NEITHER, &rReq.nodesToRead[0], &resp);
     ck_assert_int_eq(0, resp.value.arrayLength);
     ck_assert_ptr_eq(&UA_TYPES[UA_TYPES_BOOLEAN], resp.value.type);
-    ck_assert(*(UA_Boolean* )resp.value.data==UA_FALSE);
+    ck_assert(*(UA_Boolean* )resp.value.data==false);
     UA_ReadRequest_deleteMembers(&rReq);
     UA_DataValue_deleteMembers(&resp);
     UA_Server_delete(server);
@@ -360,7 +360,7 @@ START_TEST(ReadSingleAttributeSymmetricWithoutTimestamp) {
     Service_Read_single(server, &adminSession, UA_TIMESTAMPSTORETURN_NEITHER, &rReq.nodesToRead[0], &resp);
     ck_assert_int_eq(0, resp.value.arrayLength);
     ck_assert_ptr_eq(&UA_TYPES[UA_TYPES_BOOLEAN], resp.value.type);
-    ck_assert(*(UA_Boolean* )resp.value.data==UA_FALSE);
+    ck_assert(*(UA_Boolean* )resp.value.data==false);
     UA_ReadRequest_deleteMembers(&rReq);
     UA_DataValue_deleteMembers(&resp);
     UA_Server_delete(server);
@@ -401,7 +401,7 @@ START_TEST(ReadSingleAttributeContainsNoLoopsWithoutTimestamp) {
     Service_Read_single(server, &adminSession, UA_TIMESTAMPSTORETURN_NEITHER, &rReq.nodesToRead[0], &resp);
     ck_assert_int_eq(0, resp.value.arrayLength);
     ck_assert_ptr_eq(&UA_TYPES[UA_TYPES_BOOLEAN], resp.value.type);
-    ck_assert(*(UA_Boolean* )resp.value.data==UA_FALSE);
+    ck_assert(*(UA_Boolean* )resp.value.data==false);
     UA_ReadRequest_deleteMembers(&rReq);
     UA_DataValue_deleteMembers(&resp);
     UA_Server_delete(server);
@@ -562,7 +562,7 @@ START_TEST(ReadSingleAttributeHistorizingWithoutTimestamp) {
     Service_Read_single(server, &adminSession, UA_TIMESTAMPSTORETURN_NEITHER, &rReq.nodesToRead[0], &resp);
     ck_assert_int_eq(0, resp.value.arrayLength);
     ck_assert_ptr_eq(&UA_TYPES[UA_TYPES_BOOLEAN], resp.value.type);
-    ck_assert(*(UA_Boolean*)resp.value.data==UA_FALSE);
+    ck_assert(*(UA_Boolean*)resp.value.data==false);
     UA_ReadRequest_deleteMembers(&rReq);
     UA_DataValue_deleteMembers(&resp);
     UA_Server_delete(server);
@@ -582,7 +582,7 @@ START_TEST(ReadSingleAttributeExecutableWithoutTimestamp) {
     Service_Read_single(server, &adminSession, UA_TIMESTAMPSTORETURN_NEITHER, &rReq.nodesToRead[0], &resp);
     ck_assert_int_eq(0, resp.value.arrayLength);
     ck_assert_ptr_eq(&UA_TYPES[UA_TYPES_BOOLEAN], resp.value.type);
-    ck_assert(*(UA_Boolean*)resp.value.data==UA_FALSE);
+    ck_assert(*(UA_Boolean*)resp.value.data==false);
     UA_DataValue_deleteMembers(&resp);
     UA_ReadRequest_deleteMembers(&rReq);
     UA_Server_delete(server);
@@ -603,7 +603,7 @@ START_TEST(ReadSingleAttributeUserExecutableWithoutTimestamp) {
     Service_Read_single(server, &adminSession, UA_TIMESTAMPSTORETURN_NEITHER, &rReq.nodesToRead[0], &resp);
     ck_assert_int_eq(0, resp.value.arrayLength);
     ck_assert_ptr_eq(&UA_TYPES[UA_TYPES_BOOLEAN], resp.value.type);
-    ck_assert(*(UA_Boolean*)resp.value.data==UA_FALSE);
+    ck_assert(*(UA_Boolean*)resp.value.data==false);
     UA_DataValue_deleteMembers(&resp);
     UA_ReadRequest_deleteMembers(&rReq);
     UA_Server_delete(server);
@@ -688,7 +688,7 @@ START_TEST(WriteSingleAttributeNodeId) {
     UA_NodeId_init(&id);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_NODEID;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_Variant_setScalar(&wValue.value.value, &id, &UA_TYPES[UA_TYPES_NODEID]);
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_BADWRITENOTSUPPORTED);
@@ -703,7 +703,7 @@ START_TEST(WriteSingleAttributeNodeclass) {
     UA_NodeClass class;
     UA_NodeClass_init(&class);
     wValue.attributeId = UA_ATTRIBUTEID_NODECLASS;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_Variant_setScalar(&wValue.value.value, &class, &UA_TYPES[UA_TYPES_NODECLASS]);
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_BADWRITENOTSUPPORTED);
@@ -718,7 +718,7 @@ START_TEST(WriteSingleAttributeBrowseName) {
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_QUALIFIEDNAME]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_BROWSENAME;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_Server_delete(server);
@@ -730,7 +730,7 @@ START_TEST(WriteSingleAttributeDisplayName) {
     UA_WriteValue_init(&wValue);
     UA_LocalizedText testValue = UA_LOCALIZEDTEXT("en_EN", "the.answer");
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_DISPLAYNAME;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
@@ -744,11 +744,11 @@ START_TEST(WriteSingleAttributeDescription) {
     UA_WriteValue_init(&wValue);
     UA_LocalizedText testValue = UA_LOCALIZEDTEXT("en_EN", "the.answer");
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_DESCRIPTION;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_Server_delete(server);
@@ -763,7 +763,7 @@ START_TEST(WriteSingleAttributeWriteMask) {
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_WRITEMASK;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_Server_delete(server);
@@ -777,7 +777,7 @@ START_TEST(WriteSingleAttributeUserWriteMask) {
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_UINT32]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_USERWRITEMASK;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_Server_delete(server);
@@ -787,11 +787,11 @@ START_TEST(WriteSingleAttributeIsAbstract) {
     UA_Server *server = makeTestSequence();
     UA_WriteValue wValue;
     UA_WriteValue_init(&wValue);
-    UA_Boolean testValue = UA_TRUE;
+    UA_Boolean testValue = true;
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_BOOLEAN]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_ISABSTRACT;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_BADNODECLASSINVALID);
     UA_Server_delete(server);
@@ -801,11 +801,11 @@ START_TEST(WriteSingleAttributeSymmetric) {
     UA_Server *server = makeTestSequence();
     UA_WriteValue wValue;
     UA_WriteValue_init(&wValue);
-    UA_Boolean testValue = UA_TRUE;
+    UA_Boolean testValue = true;
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_BOOLEAN]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_SYMMETRIC;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_BADNODECLASSINVALID);
     UA_Server_delete(server);
@@ -819,7 +819,7 @@ START_TEST(WriteSingleAttributeInverseName) {
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_INVERSENAME;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_BADNODECLASSINVALID);
     UA_Server_delete(server);
@@ -829,11 +829,11 @@ START_TEST(WriteSingleAttributeContainsNoLoops) {
     UA_Server *server = makeTestSequence();
     UA_WriteValue wValue;
     UA_WriteValue_init(&wValue);
-    UA_Boolean testValue = UA_TRUE;
+    UA_Boolean testValue = true;
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_BOOLEAN]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_CONTAINSNOLOOPS;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_BADNODECLASSINVALID);
     UA_Server_delete(server);
@@ -847,7 +847,7 @@ START_TEST(WriteSingleAttributeEventNotifier) {
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_BYTE]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_EVENTNOTIFIER;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_BADNODECLASSINVALID);
     UA_Server_delete(server);
@@ -859,7 +859,7 @@ START_TEST(WriteSingleAttributeValue) {
     UA_WriteValue_init(&wValue);
     UA_Int32 myInteger = 20;
     UA_Variant_setScalar(&wValue.value.value, &myInteger, &UA_TYPES[UA_TYPES_INT32]);
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_VALUE;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
@@ -886,7 +886,7 @@ START_TEST(WriteSingleAttributeDataType) {
     UA_NodeId_init(&typeId);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_DATATYPE;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_Variant_setScalar(&wValue.value.value, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_BADWRITENOTSUPPORTED);
@@ -901,7 +901,7 @@ START_TEST(WriteSingleAttributeValueRank) {
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_INT32]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_VALUERANK;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     // Returns attributeInvalid, since variant/value may be writable
     ck_assert_int_eq(retval, UA_STATUSCODE_BADATTRIBUTEIDINVALID);
@@ -916,7 +916,7 @@ START_TEST(WriteSingleAttributeArrayDimensions) {
     UA_Variant_setArray(&wValue.value.value, &testValue, 3, &UA_TYPES[UA_TYPES_INT32]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_ARRAYDIMENSIONS;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     // Returns attributeInvalid, since variant/value may be writable
     ck_assert_int_eq(retval, UA_STATUSCODE_BADATTRIBUTEIDINVALID);
@@ -931,7 +931,7 @@ START_TEST(WriteSingleAttributeAccessLevel) {
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_BYTE]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_ACCESSLEVEL;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_Server_delete(server);
@@ -945,7 +945,7 @@ START_TEST(WriteSingleAttributeUserAccessLevel) {
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_BYTE]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_USERACCESSLEVEL;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_Server_delete(server);
@@ -959,7 +959,7 @@ START_TEST(WriteSingleAttributeMinimumSamplingInterval) {
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_DOUBLE]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_MINIMUMSAMPLINGINTERVAL;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_Server_delete(server);
@@ -969,11 +969,11 @@ START_TEST(WriteSingleAttributeHistorizing) {
     UA_Server *server = makeTestSequence();
     UA_WriteValue wValue;
     UA_WriteValue_init(&wValue);
-    UA_Boolean testValue = UA_TRUE;
+    UA_Boolean testValue = true;
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_BOOLEAN]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_HISTORIZING;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_Server_delete(server);
@@ -983,11 +983,11 @@ START_TEST(WriteSingleAttributeExecutable) {
     UA_Server *server = makeTestSequence();
     UA_WriteValue wValue;
     UA_WriteValue_init(&wValue);
-    UA_Boolean testValue = UA_TRUE;
+    UA_Boolean testValue = true;
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_BOOLEAN]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_EXECUTABLE;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_BADNODECLASSINVALID);
     UA_Server_delete(server);
@@ -997,11 +997,11 @@ START_TEST(WriteSingleAttributeUserExecutable) {
     UA_Server *server = makeTestSequence();
     UA_WriteValue wValue;
     UA_WriteValue_init(&wValue);
-    UA_Boolean testValue = UA_TRUE;
+    UA_Boolean testValue = true;
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_BOOLEAN]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_USEREXECUTABLE;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_BADNODECLASSINVALID);
     UA_Server_delete(server);
@@ -1015,7 +1015,7 @@ START_TEST(WriteSingleDataSourceAttributeValue) {
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_INT32]);
     wValue.nodeId = UA_NODEID_STRING(1, "cpu.temperature");
     wValue.attributeId = UA_ATTRIBUTEID_VALUE;
-    wValue.value.hasValue = UA_TRUE;
+    wValue.value.hasValue = true;
     UA_StatusCode retval = Service_Write_single(server, &adminSession, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_BADWRITENOTSUPPORTED);
     UA_Server_delete(server);

+ 1 - 1
tests/check_session.c

@@ -28,7 +28,7 @@ START_TEST(Session_init_ShallWork)
     UA_ApplicationDescription_init(&tmpAppDescription);
     UA_DateTime tmpDateTime;
     UA_DateTime_init(&tmpDateTime);
-	ck_assert_int_eq(session.activated,UA_FALSE);
+	ck_assert_int_eq(session.activated,false);
 	ck_assert_int_eq(session.authenticationToken.identifier.numeric,tmpNodeId.identifier.numeric);
 	ck_assert_int_eq(session.availableContinuationPoints,MAXCONTINUATIONPOINTS);
     ck_assert_ptr_eq(session.channel,NULL);

+ 23 - 23
tools/generate_datatypes.py

@@ -143,33 +143,33 @@ class BuiltinType(Type):
         if self.name in ["UA_String", "UA_ByteString", "UA_XmlElement"]:
             return (("{.typeName = \"" + self.name[3:] + "\", ") if typeintrospection else "{") + ".typeId = " + typeid + \
                 ".memSize = sizeof(" + self.name + "), " + \
-                ".builtin = UA_TRUE, .fixedSize = UA_FALSE, .zeroCopyable = UA_FALSE, " + \
-                ".membersSize = 1,\n\t.members = (UA_DataTypeMember[]){{.memberTypeIndex = UA_TYPES_BYTE, .namespaceZero = UA_TRUE, " + \
+                ".builtin = true, .fixedSize = false, .zeroCopyable = false, " + \
+                ".membersSize = 1,\n\t.members = (UA_DataTypeMember[]){{.memberTypeIndex = UA_TYPES_BYTE, .namespaceZero = true, " + \
                 (".memberName = \"\", " if typeintrospection else "") + \
-                ".padding = 0, .isArray = UA_TRUE }}, " + \
+                ".padding = 0, .isArray = true }}, " + \
                 ".typeIndex = %s }" % (outname.upper() + "_" + self.name[3:].upper())
 
         if self.name == "UA_QualifiedName":
             return (("{.typeName = \"" + self.name[3:] + "\", ") if typeintrospection else "{") + ".typeId = " + typeid + \
                 ".memSize = sizeof(UA_QualifiedName), " + \
-                ".builtin = UA_TRUE, .fixedSize = UA_FALSE, .zeroCopyable = UA_FALSE, " + \
+                ".builtin = true, .fixedSize = false, .zeroCopyable = false, " + \
                 ".membersSize = 2, .members = (UA_DataTypeMember[]){" + \
-                "\n\t{.memberTypeIndex = UA_TYPES_UINT16, .namespaceZero = UA_TRUE, " + \
+                "\n\t{.memberTypeIndex = UA_TYPES_UINT16, .namespaceZero = true, " + \
                 (".memberName = \"namespaceIndex\", " if typeintrospection else "") + \
-                ".padding = 0, .isArray = UA_FALSE }," + \
-                "\n\t{.memberTypeIndex = UA_TYPES_STRING, .namespaceZero = UA_TRUE, " + \
+                ".padding = 0, .isArray = false }," + \
+                "\n\t{.memberTypeIndex = UA_TYPES_STRING, .namespaceZero = true, " + \
                 (".memberName = \"name\", " if typeintrospection else "") + \
-                ".padding = offsetof(UA_QualifiedName, name)-sizeof(UA_UInt16), .isArray = UA_FALSE }},\n" + \
+                ".padding = offsetof(UA_QualifiedName, name)-sizeof(UA_UInt16), .isArray = false }},\n" + \
                 ".typeIndex = UA_TYPES_QUALIFIEDNAME }"
 
         return (("{.typeName = \"" + self.name[3:] + "\", ") if typeintrospection else "{") + ".typeId = " + typeid + \
             ".memSize = sizeof(" + self.name + "), " + \
-            ".builtin = UA_TRUE, .fixedSize = " + ("UA_TRUE" if self.fixed_size() else "UA_FALSE") + \
-            ", .zeroCopyable = " + ("UA_TRUE" if self.zero_copy() else "UA_FALSE") + \
+            ".builtin = true, .fixedSize = " + ("true" if self.fixed_size() else "false") + \
+            ", .zeroCopyable = " + ("true" if self.zero_copy() else "false") + \
             ", .membersSize = 1, .members = (UA_DataTypeMember[]){" + \
-            "\n\t{.memberTypeIndex = UA_TYPES_" + self.name[3:].upper() + " , .namespaceZero = UA_TRUE, " + \
+            "\n\t{.memberTypeIndex = UA_TYPES_" + self.name[3:].upper() + " , .namespaceZero = true, " + \
             (".memberName = \"\", " if typeintrospection else "") + \
-            ".padding = 0, .isArray = UA_FALSE }},\n" + \
+            ".padding = 0, .isArray = false }},\n" + \
             ".typeIndex = UA_TYPES_" + self.name[3:].upper() + " }"
 
 class EnumerationType(Type):
@@ -205,11 +205,11 @@ class EnumerationType(Type):
         else:
             typeid = "{.namespaceIndex = %s, .identifierType = UA_NODEIDTYPE_NUMERIC, .identifier.numeric = %s}, " % (description.namespaceid, description.nodeid)
         return (("{.typeName = \"" + self.name[3:] + "\", ") if typeintrospection else "{") + ".typeId = " + typeid + \
-            ".memSize = sizeof(" + self.name + "), .builtin = UA_TRUE, " + \
-            ".fixedSize = UA_TRUE, .zeroCopyable = UA_TRUE, " + \
+            ".memSize = sizeof(" + self.name + "), .builtin = true, " + \
+            ".fixedSize = true, .zeroCopyable = true, " + \
             ".membersSize = 1,\n\t.members = (UA_DataTypeMember[]){{.memberTypeIndex = UA_TYPES_INT32, " + \
             (".memberName = \"\", " if typeintrospection else "") + \
-            ".namespaceZero = UA_TRUE, .padding = 0, .isArray = UA_FALSE }}, .typeIndex = UA_TYPES_INT32 }"
+            ".namespaceZero = true, .padding = 0, .isArray = false }}, .typeIndex = UA_TYPES_INT32 }"
 
 class OpaqueType(Type):
     def fixed_size(self):
@@ -227,10 +227,10 @@ class OpaqueType(Type):
         else:
             typeid = "{.namespaceIndex = %s, .identifierType = UA_NODEIDTYPE_NUMERIC, .identifier.numeric = %s}, " % (description.namespaceid, description.nodeid)
         return (("{.typeName = \"" + self.name[3:] + "\", ") if typeintrospection else "{") + ".typeId = " + typeid + \
-            ".memSize = sizeof(" + self.name + "), .fixedSize = UA_FALSE, .zeroCopyable = UA_FALSE, " + \
-            ".builtin = UA_FALSE, .membersSize = 1,\n\t.members = (UA_DataTypeMember[]){{.memberTypeIndex = UA_TYPES_BYTE," + \
+            ".memSize = sizeof(" + self.name + "), .fixedSize = false, .zeroCopyable = false, " + \
+            ".builtin = false, .membersSize = 1,\n\t.members = (UA_DataTypeMember[]){{.memberTypeIndex = UA_TYPES_BYTE," + \
             (".memberName = \"\", " if typeintrospection else "") + \
-            ".namespaceZero = UA_TRUE, .padding = 0, .isArray = UA_TRUE }}, .typeIndex = %s}" % (outname.upper() + "_" + self.name[3:].upper())
+            ".namespaceZero = true, .padding = 0, .isArray = true }}, .typeIndex = %s}" % (outname.upper() + "_" + self.name[3:].upper())
 
 class StructMember(object):
     def __init__(self, name, memberType, isArray):
@@ -288,10 +288,10 @@ class StructType(Type):
             typeid = "{.namespaceIndex = %s, .identifierType = UA_NODEIDTYPE_NUMERIC, .identifier.numeric = %s}, " % (description.namespaceid, description.nodeid)
         layout = (("{.typeName = \"" + self.name[3:] + "\", ") if typeintrospection else "{") + ".typeId = " + typeid + \
                  ".memSize = sizeof(" + self.name + "), "+ \
-                 ".builtin = UA_FALSE" + \
-                 ", .fixedSize = " + ("UA_TRUE" if self.fixed_size() else "UA_FALSE") + \
+                 ".builtin = false" + \
+                 ", .fixedSize = " + ("true" if self.fixed_size() else "false") + \
                  ", .zeroCopyable = " + ("sizeof(" + self.name + ") == " + str(self.mem_size()) if self.zero_copy() \
-                                         else "UA_FALSE") + \
+                                         else "false") + \
                  ", .typeIndex = " + outname.upper() + "_" + self.name[3:].upper() + \
                  ", .membersSize = " + str(len(self.members)) + ","
         if len(self.members) > 0:
@@ -302,7 +302,7 @@ class StructType(Type):
                           ".memberTypeIndex = " + ("UA_TYPES_" + member.memberType.name[3:].upper() if args.namespace_id == 0 or member.memberType.name in existing_types else \
                                                    outname.upper() + "_" + member.memberType.name[3:].upper()) + ", " + \
                           ".namespaceZero = "+ \
-                          ("UA_TRUE, " if args.namespace_id == 0 or member.memberType.name in existing_types else "UA_FALSE, ") + \
+                          ("true, " if args.namespace_id == 0 or member.memberType.name in existing_types else "false, ") + \
                           ".padding = "
 
                 if not member.isArray:
@@ -322,7 +322,7 @@ class StructType(Type):
                         before_endpos += " + sizeof(%s))" % before.memberType.name
                 layout += "%s - %s" % (thispos, before_endpos)
 
-                layout += ", .isArray = " + ("UA_TRUE" if member.isArray else "UA_FALSE") + " }, "
+                layout += ", .isArray = " + ("true" if member.isArray else "false") + " }, "
             layout += "}"
         return layout + "}"
 

+ 4 - 4
tools/pyUANamespace/open62541_MacroHelper.py

@@ -73,16 +73,16 @@ class open62541_MacroHelper():
     #code.append(refid + ".sourceNodeId = " + self.getCreateNodeIDMacro(sourcenode) + ";")
     #code.append(refid + ".referenceTypeId = " + self.getCreateNodeIDMacro(reference.referenceType()) + ";")
     #if reference.isForward():
-      #code.append(refid + ".isForward = UA_TRUE;")
+      #code.append(refid + ".isForward = true;")
     #else:
-      #code.append(refid + ".isForward = UA_FALSE;")
+      #code.append(refid + ".isForward = false;")
     #code.append(refid + ".targetNodeId = " + self.getCreateExpandedNodeIDMacro(reference.target()) + ";")
     #code.append("addOneWayReferenceWithSession(server, (UA_Session *) NULL, &" + refid + ");")
 
     if reference.isForward():
-      code.append("UA_Server_addReference(server, " + self.getCreateNodeIDMacro(sourcenode) + ", " + self.getCreateNodeIDMacro(reference.referenceType()) + ", " + self.getCreateExpandedNodeIDMacro(reference.target()) + ", UA_TRUE);")
+      code.append("UA_Server_addReference(server, " + self.getCreateNodeIDMacro(sourcenode) + ", " + self.getCreateNodeIDMacro(reference.referenceType()) + ", " + self.getCreateExpandedNodeIDMacro(reference.target()) + ", true);")
     else:
-      code.append("UA_Server_addReference(server, " + self.getCreateNodeIDMacro(sourcenode) + ", " + self.getCreateNodeIDMacro(reference.referenceType()) + ", " + self.getCreateExpandedNodeIDMacro(reference.target()) + ", UA_FALSE);")
+      code.append("UA_Server_addReference(server, " + self.getCreateNodeIDMacro(sourcenode) + ", " + self.getCreateNodeIDMacro(reference.referenceType()) + ", " + self.getCreateExpandedNodeIDMacro(reference.target()) + ", false);")
     return code
                                
   def getCreateNodeNoBootstrap(self, node, parentNode, parentReference):

+ 3 - 3
tools/pyUANamespace/ua_builtin_types.py

@@ -830,12 +830,12 @@ class opcua_BuiltinType_boolean_t(opcua_value_t):
     # Catch XML <Boolean /> by setting the value to a default
     if xmlvalue.firstChild == None:
       log(self, "No value is given. Setting to default 0")
-      self.value = "UA_FALSE"
+      self.value = "false"
     else:
       if "false" in unicode(xmlvalue.firstChild.data).lower():
-        self.value = "UA_FALSE"
+        self.value = "false"
       else:
-        self.value = "UA_TRUE"
+        self.value = "true"
 
   def printOpen62541CCode_SubType(self, asIndirect=True):
     return "(UA_" + self.stringRepresentation + ") " + str(self.value)

+ 18 - 18
tools/pyUANamespace/ua_node_types.py

@@ -829,9 +829,9 @@ class opcua_node_referenceType_t(opcua_node_t):
       return code
     
     if self.isAbstract():
-      code.append(self.getCodePrintableID() + "->isAbstract = UA_TRUE;")
+      code.append(self.getCodePrintableID() + "->isAbstract = true;")
     if self.symmetric():
-      code.append(self.getCodePrintableID() + "->symmetric  = UA_TRUE;")
+      code.append(self.getCodePrintableID() + "->symmetric  = true;")
     if self.__reference_inverseName__ != "":
       code.append(self.getCodePrintableID() + "->inverseName  = UA_LOCALIZEDTEXT_ALLOC(\"en_US\", \"" + self.__reference_inverseName__ + "\");")
     return code;
@@ -1088,7 +1088,7 @@ class opcua_node_variable_t(opcua_node_t):
       return code
     
     if self.historizing():
-      code.append(self.getCodePrintableID() + "->historizing = UA_TRUE;")
+      code.append(self.getCodePrintableID() + "->historizing = true;")
 
     code.append(self.getCodePrintableID() + "->minimumSamplingInterval = (UA_Double) " + str(self.minimumSamplingInterval()) + ";")
     code.append(self.getCodePrintableID() + "->userAccessLevel = (UA_Int32) " + str(self.userAccessLevel()) + ";")
@@ -1163,9 +1163,9 @@ class opcua_node_method_t(opcua_node_t):
     
     # UA_False is default for booleans on _init()
     if self.executable():
-      code.append(self.getCodePrintableID() + "->executable = UA_TRUE;")
+      code.append(self.getCodePrintableID() + "->executable = true;")
     if self.userExecutable():
-      code.append(self.getCodePrintableID() + "->userExecutable = UA_TRUE;")
+      code.append(self.getCodePrintableID() + "->userExecutable = true;")
 
     return code
 
@@ -1222,13 +1222,13 @@ class opcua_node_objectType_t(opcua_node_t):
           unPrintedReferences.remove(myTypeRef)
       
       if (self.isAbstract()):
-        code.append("       UA_TRUE,")
+        code.append("       true,")
       else:
-        code.append("       UA_FALSE,")
+        code.append("       false,")
     
     # Fallback mode for bootstrapping
     if (self.isAbstract()):
-      code.append(self.getCodePrintableID() + "->isAbstract = UA_TRUE;")
+      code.append(self.getCodePrintableID() + "->isAbstract = true;")
 
     return code
 
@@ -1339,15 +1339,15 @@ class opcua_node_variableType_t(opcua_node_t):
       code.append("       " + self.getCodePrintableID() + "_variant, ")
       code.append("       " + str(self.valueRank()) + ",")
       if self.isAbstract():
-        code.append("       UA_TRUE,")
+        code.append("       true,")
       else:
-        code.append("       UA_FALSE,")
+        code.append("       false,")
       return code
     
     if (self.isAbstract()):
-      code.append(self.getCodePrintableID() + "->isAbstract = UA_TRUE;")
+      code.append(self.getCodePrintableID() + "->isAbstract = true;")
     else:
-      code.append(self.getCodePrintableID() + "->isAbstract = UA_FALSE;")
+      code.append(self.getCodePrintableID() + "->isAbstract = false;")
     
     # The variant is guaranteed to exist by SubtypeEarly()
     code.append(self.getCodePrintableID() + "->value.variant.value = *" + self.getCodePrintableID() + "_variant;")
@@ -1688,15 +1688,15 @@ class opcua_node_dataType_t(opcua_node_t):
           unPrintedReferences.remove(myTypeRef)
       
       if (self.isAbstract()):
-        code.append("       UA_TRUE,")
+        code.append("       true,")
       else:
-        code.append("       UA_FALSE,")
+        code.append("       false,")
       return code
     
     if (self.isAbstract()):
-      code.append(self.getCodePrintableID() + "->isAbstract = UA_TRUE;")
+      code.append(self.getCodePrintableID() + "->isAbstract = true;")
     else:
-      code.append(self.getCodePrintableID() + "->isAbstract = UA_FALSE;")
+      code.append(self.getCodePrintableID() + "->isAbstract = false;")
     return code
 
 class opcua_node_view_t(opcua_node_t):
@@ -1757,9 +1757,9 @@ class opcua_node_view_t(opcua_node_t):
       return code
     
     if self.containsNoLoops():
-      code.append(self.getCodePrintableID() + "->containsNoLoops = UA_TRUE;")
+      code.append(self.getCodePrintableID() + "->containsNoLoops = true;")
     else:
-      code.append(self.getCodePrintableID() + "->containsNoLoops = UA_FALSE;")
+      code.append(self.getCodePrintableID() + "->containsNoLoops = false;")
 
     code.append(self.getCodePrintableID() + "->eventNotifier = (UA_Byte) " + str(self.eventNotifier()) + ";")