Wrong Merging fixed.

OPCUAServer/ltmain.sh

@@ -1 +0,0 @@
-/usr/share/libtool/config/ltmain.sh

OPCUAServer/ltmain.sh

@@ -0,0 +1 @@
+/usr/share/libtool/config/ltmain.sh

OPCUAServer/src/opcua_binaryEncDec.c

@@ -79,17 +79,13 @@ Int64 convertToInt64(char* buf, int pos)
 	return t1 + t2 + t3 + t4 + t5 + t6 + t7 + t8;
 }
 
-<<<<<<< HEAD
 Int64 convertToInt64_test(char* buf, int pos)
 {
 
 	printf("");
 }
 
-UA_String convertToUAString(char* buf, int pos)
-=======
-convertToUAString(char* buf, int pos,UA_String *dstUAString)
->>>>>>> branch 'master' of https://github.com/Stasik0/Open62541.git
+void convertToUAString(char* buf, int pos, UA_String* dstUAString)
 {
 
 	dstUAString->Length = convertToInt32(buf,pos);
@@ -111,43 +107,27 @@ convertToUAGuid(char* buf, int pos,UA_Guid* dstGUID)
 	UInt32 i = 0;
 	for(i = 1; i <= 4; i++)
 	{
-<<<<<<< HEAD
-		tmpUAGuid.Data1[i] = convertToUInt32(buf, pos+counter);
-=======
 		dstGUID->Data1[i] = convertToUInt32(*buf, pos+counter);
->>>>>>> branch 'master' of https://github.com/Stasik0/Open62541.git
 		counter += sizeof(UInt32);
 	}
 	for(i = 1; i <= 2; i++)
 	{
-<<<<<<< HEAD
-		tmpUAGuid.Data2[i] = convertToUInt16(buf, pos+counter);
-=======
 		dstGUID->Data2[i] = convertToUInt16(*buf, pos+counter);
->>>>>>> branch 'master' of https://github.com/Stasik0/Open62541.git
 		counter += sizeof(UInt16);
 	}
 	for(i = 1; i <= 2; i++)
 	{
-<<<<<<< HEAD
-		tmpUAGuid.Data3[i] = convertToUInt16(buf, pos+counter);
-=======
 		dstGUID->Data3[i] = convertToUInt16(*buf, pos+counter);
->>>>>>> branch 'master' of https://github.com/Stasik0/Open62541.git
 		counter += sizeof(UInt16);
 	}
 	for(i = 1; i <= 8; i++)
 	{
-<<<<<<< HEAD
-		tmpUAGuid.Data4[i] = convertToByte(buf, pos+counter);
-=======
 		dstGUID->Data4[i] = convertToByte(*buf, pos+counter);
->>>>>>> branch 'master' of https://github.com/Stasik0/Open62541.git
 		counter += sizeof(Byte);
 	}
 }
 
-<<<<<<< HEAD
+
 UA_ByteString convertToUAByteString(char* buf, int pos){
 	UA_ByteString tmpUAByteString;
 	int counter = sizeof(Int32);
@@ -181,14 +161,10 @@ UA_StatusCode convertToUAStatusCode(char* buf, int pos){
 	return convertToUInt32(buf, pos);
 }
 
-UA_NodeId convertToUANodeId(char* buf, int pos){
-	UA_NodeId tmpUANodeId;
-	tmpUANodeId.EncodingByte = convertToInt32(buf, 0);
-=======
+
 void convertToUANodeId(char* buf, int pos, UA_NodeId* dstNodeId){
 
 	dstNodeId->EncodingByte = convertToInt32(buf, 0);
->>>>>>> branch 'master' of https://github.com/Stasik0/Open62541.git
 	int counter = sizeof(UInt32);
 
 	UA_NodeIdEncodingValuesType encodingType = dstNodeId->EncodingByte;
@@ -197,54 +173,32 @@ void convertToUANodeId(char* buf, int pos, UA_NodeId* dstNodeId){
 	{
 		case NIEVT_TWO_BYTE:
 		{
-<<<<<<< HEAD
-			tmpUANodeId.Identifier.Numeric = convertToInt32(buf, counter);
-=======
 			dstNodeId->Identifier.Numeric = convertToInt32(buf, counter);
->>>>>>> branch 'master' of https://github.com/Stasik0/Open62541.git
 			counter += sizeof(UInt16);
 			break;
 		}
 		case NIEVT_FOUR_BYTE:
 		{
-<<<<<<< HEAD
-			tmpUANodeId.Identifier.Numeric = convertToInt32(buf, counter);
-=======
 			dstNodeId->Identifier.Numeric = convertToInt32(buf, counter);
->>>>>>> branch 'master' of https://github.com/Stasik0/Open62541.git
 			counter += sizeof(Int64);
 			break;
 		}
 		case NIEVT_NUMERIC:
 		{
-<<<<<<< HEAD
-			tmpUANodeId.Identifier.Numeric = convertToInt32(buf, counter);
-=======
 			dstNodeId->Identifier.Numeric = convertToInt32(buf, counter);
->>>>>>> branch 'master' of https://github.com/Stasik0/Open62541.git
 			counter += sizeof(UInt32);
 			break;
 		}
 		case NIEVT_STRING:
 		{
-<<<<<<< HEAD
-			tmpUANodeId.Identifier.String = convertToUAString(buf, counter);
-			counter += sizeof(sizeof(UInt32) + tmpUANodeId.Identifier.String.Length*sizeof(char));
-=======
-
 			convertToUAString(buf, counter,&dstNodeId->Identifier.String);
 			counter += sizeof(sizeof(UInt32) + dstNodeId->Identifier.String.Length);
->>>>>>> branch 'master' of https://github.com/Stasik0/Open62541.git
 			break;
 		}
 		case NIEVT_GUID:
 		{
-<<<<<<< HEAD
 			tmpUANodeId.Identifier.Guid = convertToUAGuid(buf, counter);
-=======
-
 			convertToUAGuid(buf, counter,&dstNodeId->Identifier.Guid);
->>>>>>> branch 'master' of https://github.com/Stasik0/Open62541.git
 			counter += sizeof(UA_Guid);
 			break;
 		}

OPCUAServer/src/opcua_encodingLayer.c

@@ -9,7 +9,6 @@
 #include "opcua_types.h"
 #include "opcua_builtInDatatypes.h"
 
-<<<<<<< HEAD
 /**
 * IntegerId
 * Part: 4
@@ -56,25 +55,13 @@ T_DiagnosticInfo convertToTDiagnosticInfo(char* buf, int pos){
 * Chapter: 7.26
 * Page: 132
 */
-T_RequestHeader encodeTRequestHeader(char* buf){
-=======
 T_RequestHeader encodeRequestHeader(char* buf)
 {
->>>>>>> branch 'master' of https://github.com/Stasik0/Open62541.git
 	T_RequestHeader tmpRequestHeader;
 	int counter = 0;
 	//ToDo: counter needs the length of the buffer,
 	//		strings have in this type just the size of the pointer not of the content
-<<<<<<< HEAD
 	tmpRequestHeader.authenticationToken = convertToUANodeId(buf, counter);
-	if(tmpRequestHeader.authenticationToken.EncodingByte ==  NIEVT_STRING){
-		counter = sizeof(tmpRequestHeader.authenticationToken.EncodingByte) +
-				sizeof(tmpRequestHeader.authenticationToken.Namespace) +
-				sizeof(tmpRequestHeader.authenticationToken.Identifier.String.Length) +
-				sizeof(tmpRequestHeader.authenticationToken.Identifier.String.Data);
-	}else{
-=======
-	tmpRequestHeader.authenticationToken = convertToUANodeId(*buf, counter);
 	if (tmpRequestHeader.authenticationToken.EncodingByte == NIEVT_STRING)
 	{
 		counter =
@@ -85,7 +72,6 @@ T_RequestHeader encodeRequestHeader(char* buf)
 	}
 	else
 	{
->>>>>>> branch 'master' of https://github.com/Stasik0/Open62541.git
 		counter = sizeof(tmpRequestHeader.authenticationToken);
 	}
 	tmpRequestHeader.timestamp = convertToUADateTime(buf, counter);
@@ -103,7 +89,6 @@ T_RequestHeader encodeRequestHeader(char* buf)
 	return tmpRequestHeader;
 }
 
-<<<<<<< HEAD
 /**
 * ResponseHeader
 * Part: 4
@@ -123,7 +108,8 @@ T_ResponseHeader encodeTResponseHeader(char* buf){
 
 
 	return tmpResponseHeader;
-=======
+}
+
 void decodeMessage_test()
 {
 
@@ -142,6 +128,4 @@ UA_ExtensionObject processMessage(AD_RawMessage *rawMessage)
 
 
 	//callServiceHandler(tmpNodeId,rawMessage);
-
->>>>>>> branch 'master' of https://github.com/Stasik0/Open62541.git
 }