purely cosmetic improvements

src/client/ua_client.c

@@ -251,6 +251,7 @@ static UA_StatusCode SecureChannelHandshake(UA_Client *client, UA_Boolean renew)
         response.responseHeader.serviceResult = retval;
         return retval;
     }
+
     client->scExpiresAt = UA_DateTime_now() + response.securityToken.revisedLifetime * 10000;
     UA_ByteString_deleteMembers(&reply);
     retval = response.responseHeader.serviceResult;

src/client/ua_client_highlevel.c

@@ -4,51 +4,45 @@
 #include "ua_types_encoding_binary.h"
 #include "ua_util.h"
 
-UA_StatusCode UA_Client_NamespaceGetIndex(UA_Client *client, UA_String *namespaceUri, UA_UInt16 *namespaceIndex){
-	UA_ReadRequest ReadRequest;
-	UA_ReadResponse ReadResponse;
-	UA_StatusCode retval = UA_STATUSCODE_BADUNEXPECTEDERROR;
-
-	UA_ReadRequest_init(&ReadRequest);
+UA_StatusCode
+UA_Client_NamespaceGetIndex(UA_Client *client, UA_String *namespaceUri, UA_UInt16 *namespaceIndex) {
+	UA_request request;
+	UA_request_init(&request);
     UA_ReadValueId id;
 	id.attributeId = UA_ATTRIBUTEID_VALUE;
 	id.nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_NAMESPACEARRAY);
-	ReadRequest.nodesToRead = &id;
-	ReadRequest.nodesToReadSize = 1;
+	request.nodesToRead = &id;
+	request.nodesToReadSize = 1;
 
-	ReadResponse = UA_Client_Service_read(client, ReadRequest);
+	UA_response response = UA_Client_Service_read(client, request);
 
-    if(ReadResponse.responseHeader.serviceResult != UA_STATUSCODE_GOOD){
-        retval = ReadResponse.responseHeader.serviceResult;
-        goto cleanup;
-    }
-
-    if(ReadResponse.resultsSize != 1 || !ReadResponse.results[0].hasValue){
+	UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD)
+        retval = response.responseHeader.serviceResult;
+    else if(response.resultsSize != 1 || !response.results[0].hasValue)
         retval = UA_STATUSCODE_BADNODEATTRIBUTESINVALID;
-        goto cleanup;
-    }
-
-    if(ReadResponse.results[0].value.type != &UA_TYPES[UA_TYPES_STRING]){
+    else if(response.results[0].value.type != &UA_TYPES[UA_TYPES_STRING])
         retval = UA_STATUSCODE_BADTYPEMISMATCH;
-        goto cleanup;
+
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_response_deleteMembers(&response);
+        return retval;
     }
 
     retval = UA_STATUSCODE_BADNOTFOUND;
-    for(UA_UInt16 iterator = 0; iterator < ReadResponse.results[0].value.arrayLength; iterator++){
-        if(UA_String_equal(namespaceUri, &((UA_String*)ReadResponse.results[0].value.data)[iterator] )){
-            *namespaceIndex = iterator;
+    UA_String *ns = response.results[0].value.data;
+    for(size_t i = 0; i < response.results[0].value.arrayLength; i++){
+        if(UA_String_equal(namespaceUri, &ns[i])) {
+            *namespaceIndex = i;
             retval = UA_STATUSCODE_GOOD;
             break;
         }
     }
 
-cleanup:
-    UA_ReadResponse_deleteMembers(&ReadResponse);
-
+    UA_response_deleteMembers(&response);
 	return retval;
 }
 
-
 /*******************/
 /* Node Management */
 /*******************/
@@ -114,8 +108,8 @@ UA_Client_deleteReference(UA_Client *client, const UA_NodeId sourceNodeId, const
     return retval;
 }
 
-UA_StatusCode UA_Client_deleteNode(UA_Client *client, const UA_NodeId nodeId,
-                                   UA_Boolean deleteTargetReferences) {
+UA_StatusCode
+UA_Client_deleteNode(UA_Client *client, const UA_NodeId nodeId, UA_Boolean deleteTargetReferences) {
     UA_DeleteNodesItem item;
     UA_DeleteNodesItem_init(&item);
     item.nodeId = nodeId;
@@ -139,11 +133,11 @@ UA_StatusCode UA_Client_deleteNode(UA_Client *client, const UA_NodeId nodeId,
     return retval;
 }
 
-UA_StatusCode __UA_Client_addNode(UA_Client *client, const UA_NodeClass nodeClass,
-                                  const UA_NodeId requestedNewNodeId, const UA_NodeId parentNodeId,
-                                  const UA_NodeId referenceTypeId, const UA_QualifiedName browseName,
-                                  const UA_NodeId typeDefinition, const UA_NodeAttributes *attr,
-                                  const UA_DataType *attributeType, UA_NodeId *outNewNodeId) {
+UA_StatusCode
+__UA_Client_addNode(UA_Client *client, const UA_NodeClass nodeClass, const UA_NodeId requestedNewNodeId,
+                    const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
+                    const UA_QualifiedName browseName, const UA_NodeId typeDefinition,
+                    const UA_NodeAttributes *attr, const UA_DataType *attributeType, UA_NodeId *outNewNodeId) {
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_AddNodesRequest request;
     UA_AddNodesRequest_init(&request);
@@ -182,9 +176,8 @@ UA_StatusCode __UA_Client_addNode(UA_Client *client, const UA_NodeClass nodeClas
 /********/
 
 UA_StatusCode
-UA_Client_call(UA_Client *client, const UA_NodeId objectId, const UA_NodeId methodId,
-               UA_Int32 inputSize, const UA_Variant *input, UA_Int32 *outputSize,
-               UA_Variant **output) {
+UA_Client_call(UA_Client *client, const UA_NodeId objectId, const UA_NodeId methodId, UA_Int32 inputSize,
+               const UA_Variant *input, UA_Int32 *outputSize, UA_Variant **output) {
     UA_CallRequest request;
     UA_CallRequest_init(&request);
     UA_CallMethodRequest item;
@@ -239,6 +232,7 @@ __UA_Client_readAttribute(UA_Client *client, UA_NodeId nodeId, UA_AttributeId at
         UA_ReadResponse_deleteMembers(&response);
         return retval;
     }
+
     UA_DataValue *res = response.results;
     if(res->hasStatus != UA_STATUSCODE_GOOD)
         retval = res->hasStatus;
@@ -248,17 +242,18 @@ __UA_Client_readAttribute(UA_Client *client, UA_NodeId nodeId, UA_AttributeId at
         UA_ReadResponse_deleteMembers(&response);
         return retval;
     }
+
     if(attributeId == UA_ATTRIBUTEID_VALUE) {
         memcpy(out, &res->value, sizeof(UA_Variant));
         UA_Variant_init(&res->value);
-    }
-    else if(res->value.type != outDataType) {
+    } else if(res->value.type != outDataType) {
         retval = UA_STATUSCODE_BADUNEXPECTEDERROR;
     } else {
         memcpy(out, res->value.data, res->value.type->memSize);
         UA_free(res->value.data);
         res->value.data = NULL;
     }
+
     UA_ReadResponse_deleteMembers(&response);
     return retval;
 }

src/server/ua_services_discovery.c

@@ -2,7 +2,8 @@
 #include "ua_services.h"
 #include "ua_util.h"
 
-void Service_FindServers(UA_Server *server, const UA_FindServersRequest *request, UA_FindServersResponse *response) {
+void Service_FindServers(UA_Server *server, const UA_FindServersRequest *request,
+                         UA_FindServersResponse *response) {
     response->servers = UA_malloc(sizeof(UA_ApplicationDescription));
     if(!response->servers) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
@@ -16,7 +17,8 @@ void Service_FindServers(UA_Server *server, const UA_FindServersRequest *request
 	response->serversSize = 1;
 }
 
-void Service_GetEndpoints(UA_Server *server, const UA_GetEndpointsRequest *request, UA_GetEndpointsResponse *response) {
+void Service_GetEndpoints(UA_Server *server, const UA_GetEndpointsRequest *request,
+                          UA_GetEndpointsResponse *response) {
     /* test if the supported binary profile shall be returned */
 #ifdef NO_ALLOCA
 	UA_Boolean relevant_endpoints[server->endpointDescriptionsSize];
@@ -67,4 +69,3 @@ void Service_GetEndpoints(UA_Server *server, const UA_GetEndpointsRequest *reque
     }
     response->endpointsSize = relevant_count;
 }
-

src/server/ua_services_session.c

@@ -3,8 +3,7 @@
 #include "ua_session_manager.h"
 #include "ua_types_generated_encoding_binary.h"
 
-void Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
-                           const UA_CreateSessionRequest *request,
+void Service_CreateSession(UA_Server *server, UA_SecureChannel *channel, const UA_CreateSessionRequest *request,
                            UA_CreateSessionResponse *response) {
     response->responseHeader.serviceResult =
         UA_Array_copy(server->endpointDescriptions, server->endpointDescriptionsSize,
@@ -14,12 +13,12 @@ void Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
     response->serverEndpointsSize = server->endpointDescriptionsSize;
 
 	UA_Session *newSession;
-    response->responseHeader.serviceResult = UA_SessionManager_createSession(&server->sessionManager,
-                                                                             channel, request, &newSession);
+    response->responseHeader.serviceResult =
+        UA_SessionManager_createSession(&server->sessionManager, channel, request, &newSession);
 	if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-    UA_LOG_DEBUG(server->logger, UA_LOGCATEGORY_SESSION,
-                 "Processing CreateSessionRequest on SecureChannel %i failed",
-                 channel->securityToken.channelId);
+        UA_LOG_DEBUG(server->logger, UA_LOGCATEGORY_SESSION,
+                     "Processing CreateSessionRequest on SecureChannel %i failed",
+                     channel->securityToken.channelId);
 		return;
     }
 
@@ -43,11 +42,10 @@ void Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
 }
 
 void Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
-                             const UA_ActivateSessionRequest *request,
-                             UA_ActivateSessionResponse *response) {
+                             const UA_ActivateSessionRequest *request, UA_ActivateSessionResponse *response) {
     // make the channel know about the session
-	UA_Session *foundSession = UA_SessionManager_getSession(&server->sessionManager,
-                                                            &request->requestHeader.authenticationToken);
+	UA_Session *foundSession =
+        UA_SessionManager_getSession(&server->sessionManager, &request->requestHeader.authenticationToken);
 
 	if(!foundSession) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADSESSIONIDINVALID;

src/server/ua_services_view.c

@@ -37,8 +37,9 @@ fillReferenceDescription(UA_NodeStore *ns, const UA_Node *curr, UA_ReferenceNode
 }
 
 #ifdef UA_EXTERNAL_NAMESPACES
-static const UA_Node * returnRelevantNodeExternal(UA_ExternalNodeStore *ens, const UA_BrowseDescription *descr,
-                                                  const UA_ReferenceNode *reference) {
+static const UA_Node *
+returnRelevantNodeExternal(UA_ExternalNodeStore *ens, const UA_BrowseDescription *descr,
+                           const UA_ReferenceNode *reference) {
     /*	prepare a read request in the external nodestore	*/
     UA_ReadValueId *readValueIds = UA_Array_new(&UA_TYPES[UA_TYPES_READVALUEID], 6);
     UA_UInt32 *indices = UA_Array_new(&UA_TYPES[UA_TYPES_UINT32], 6);