cleaning up ua_services_view.c

src/ua_services_view.c

@@ -134,135 +134,14 @@ UA_Int32 Service_Browse(SL_Channel *channel, const UA_BrowseRequest *request,
 					request->requestedMaxReferencesPerNode,
 					&response->results[i]);
 		}
-		return retval;
+
 		response->diagnosticInfosSize = 0;
 		response->diagnosticInfos = UA_NULL;
 		//TODO fill Diagnostic info array
+		return retval;
 	}
 	return UA_ERROR;
 }
-/*
-UA_Int32 Service_Browse(SL_Channel *channel, const UA_BrowseRequest *request,
-		UA_BrowseResponse *response) {
-	UA_Int32 retval = UA_SUCCESS;
-	DBG_VERBOSE(UA_NodeId_printf("BrowseService - view=", &request->view.viewId));
-	UA_Int32 i = 0;
-
-	UA_Array_new((void**) &(response->results), request->nodesToBrowseSize,
-			&UA_.types[UA_BROWSERESULT]);
-	response->resultsSize = request->nodesToBrowseSize;
-
-	for (i = 0;
-			request->nodesToBrowseSize > 0 && i < request->nodesToBrowseSize;
-			i++) {
-		UA_list_List referencesToReturn;
-		UA_list_init(&referencesToReturn);
-		UA_UInt32 j = 0;
-		Namespace *ns = UA_indexedList_findValue(
-				channel->session->application->namespaces,
-				request->nodesToBrowse[i].nodeId.namespace);
-		const UA_Node *node;
-		Namespace_Entry_Lock *lock;
-		Namespace_get(ns, &request->nodesToBrowse[i].nodeId, (&node), &lock);
-
-		if (request->requestedMaxReferencesPerNode > 0) {
-			UA_Int32 k = 0;
-			while (j < request->requestedMaxReferencesPerNode
-					&& k < node->referencesSize) {
-				//TODO include subtypes missing how to determine a subtype?
-				if (((node->references[k].isInverse)
-						&& ((request->nodesToBrowse->browseDirection
-								== UA_BROWSEDIRECTION_INVERSE)
-								|| (request->nodesToBrowse->browseDirection
-										== UA_BROWSEDIRECTION_BOTH)))
-						|| (!node->references[k].isInverse
-								&& ((request->nodesToBrowse->browseDirection
-										== UA_BROWSEDIRECTION_BOTH)
-										|| (request->nodesToBrowse->browseDirection
-												== UA_BROWSEDIRECTION_FORWARD)))) {
-					UA_ReferenceDescription *rd;
-					UA_ReferenceDescription_new(&rd);
-					const UA_Node* targetNode;
-					Namespace_Entry_Lock *lock1;
-					UA_Int32 ret = Namespace_get(ns, &node->references[k].targetId.nodeId,
-							&targetNode, &lock1);
-
-					if (ret==UA_SUCCESS &&targetNode
-							&& ((request->nodesToBrowse->nodeClassMask
-									& targetNode->nodeClass) || (request->nodesToBrowse->nodeClassMask == 0))) {
-						UA_UInt32 mask = 0;
-						rd->resultMask = 0;
-						for (mask = 0x01; mask <= 0x40; mask *= 2) {
-							switch (mask & (request->nodesToBrowse->resultMask)) {
-							case 1:
-								UA_NodeId_copy(
-										&node->references[k].referenceTypeId,
-										&rd->referenceTypeId);
-								rd->resultMask |= (1 << 0);
-								break;
-							case 2:
-								rd->isForward = !node->references[k].isInverse;
-								rd->resultMask |= (1 << 1);
-								break;
-							case 4:
-								UA_NodeClass_copy(&targetNode->nodeClass,
-										&rd->nodeClass);
-								rd->resultMask |= (1 << 2);
-								break;
-							case 8:
-								UA_QualifiedName_copy(&targetNode->browseName,
-										&rd->browseName);
-								rd->resultMask |= (1 << 3);
-								break;
-							case 16:
-								UA_LocalizedText_copy(&targetNode->displayName,
-										&rd->displayName);
-								rd->resultMask |= (1 << 4);
-								break;
-							case 32:
-								if (rd->nodeClass == UA_NODECLASS_OBJECT
-										|| rd->nodeClass
-												== UA_NODECLASS_VARIABLE) {
-									UA_NodeId_copy(&targetNode->nodeId,
-											&rd->typeDefinition);
-									rd->resultMask |= (1 << 5);
-								}
-								break;
-							}
-						}
-						UA_list_addPayloadToBack(&referencesToReturn, rd);
-						j++;
-					}
-				}
-				k++;
-			}
-		}
-		UA_Array_new((void**) &response->results[i].references, j,
-				&UA_.types[UA_REFERENCEDESCRIPTION]);
-		response->results[i].referencesSize = j;
-		UA_list_Element *element = referencesToReturn.first;
-		UA_UInt32 l = 0;
-
-		for (l = 0; l < j; l++) {
-			UA_ReferenceDescription_copy(
-					(UA_ReferenceDescription*) element->payload,
-					&response->results[i].references[l]);
-			element = element->next;
-		}
-		UA_list_destroy(&referencesToReturn,
-				(UA_list_PayloadVisitor) UA_ReferenceDescription_delete);
-	}
-	response->diagnosticInfosSize = 0;
-
-	return retval;
-
-}
-*/
-//UA_BrowseResult br;
-//UA_ReferenceNode rn;
-
-//UA_Array_new(&response->results,j,UA_BROWSERESULT_NS0)
-//UA_NodeId_printf("BrowseService - nodesToBrowse=", &request->nodesToBrowse[i].nodeId);
 
 UA_Int32 Service_TranslateBrowsePathsToNodeIds(SL_Channel *channel,
 		const UA_TranslateBrowsePathsToNodeIdsRequest *request,

src/ua_types_encoding_binary.c

@@ -819,7 +819,7 @@ UA_Int32 UA_Variant_decodeBinary(UA_ByteString const *src, UA_UInt32 *offset, UA
 	CHECKED_DECODE(UA_Byte_decodeBinary(src, offset, &encodingByte),; );
 
 	UA_Boolean isArray = encodingByte & (0x01 << 7);                             // Bit 7
-	UA_Boolean hasDimensions = isArray && encodingByte & (0x01 << 6);            // Bit 6
+	UA_Boolean hasDimensions = isArray && (encodingByte & (0x01 << 6));            // Bit 6
 
 	UA_NodeId typeid = { .encodingByte = (UA_Byte)UA_NODEIDTYPE_FOURBYTE, .namespace= 0,
 						 .identifier.numeric = encodingByte & 0x3F };