From 06d389ed1e6157f1fe736c5dacf121eec247ea14 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Tue, 7 Jul 2020 17:25:52 +0200
Subject: [PATCH] increased srv2 readability

---
 pus/Service2DeviceAccess.cpp | 24 ++++++------------------
 pus/Service2DeviceAccess.h   |  2 --
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/pus/Service2DeviceAccess.cpp b/pus/Service2DeviceAccess.cpp
index d1f8faf3..ee48b46d 100644
--- a/pus/Service2DeviceAccess.cpp
+++ b/pus/Service2DeviceAccess.cpp
@@ -34,29 +34,17 @@ ReturnValue_t Service2DeviceAccess::isValidSubservice(uint8_t subservice) {
 ReturnValue_t Service2DeviceAccess::getMessageQueueAndObject(
 		uint8_t subservice, const uint8_t* tcData, size_t tcDataLen,
 		MessageQueueId_t* id, object_id_t* objectId) {
-	ReturnValue_t result = checkAndAcquireTargetID(objectId,tcData,tcDataLen);
-	if(result != HasReturnvaluesIF::RETURN_OK) {
-		return result;
-	}
+    if(tcDataLen < sizeof(object_id_t)) {
+        return CommandingServiceBase::INVALID_TC;
+    }
+    SerializeAdapter::deSerialize(objectId, &tcData,
+                &tcDataLen, SerializeIF::Endianness::BIG);
 
-	result = checkInterfaceAndAcquireMessageQueue(id,objectId);
+	ReturnValue_t result = checkInterfaceAndAcquireMessageQueue(id,objectId);
 	return result;
 
 }
 
-ReturnValue_t Service2DeviceAccess::checkAndAcquireTargetID(
-		object_id_t* objectIdToSet, const uint8_t* tcData, size_t tcDataLen) {
-	if(SerializeAdapter::deSerialize(objectIdToSet, &tcData,
-	        &tcDataLen, SerializeIF::Endianness::BIG) != RETURN_OK) {
-		sif::error << "Service 2: Target ID not found. ID: " <<
-				std::hex << objectIdToSet ;
-		return CommandingServiceBase::INVALID_TC;
-	}
-	else {
-		return HasReturnvaluesIF::RETURN_OK;
-	}
-}
-
 ReturnValue_t Service2DeviceAccess::checkInterfaceAndAcquireMessageQueue(
 		MessageQueueId_t * messageQueueToSet, object_id_t *objectId) {
 	DeviceHandlerIF* possibleTarget =
diff --git a/pus/Service2DeviceAccess.h b/pus/Service2DeviceAccess.h
index 20fc30b9..4dab0fa0 100644
--- a/pus/Service2DeviceAccess.h
+++ b/pus/Service2DeviceAccess.h
@@ -73,8 +73,6 @@ private:
 	 */
 	void sendWiretappingTm(CommandMessage* reply,uint8_t subservice);
 
-	ReturnValue_t checkAndAcquireTargetID(object_id_t* objectIdToSet,
-	        const uint8_t* tcData, size_t tcDataLen);
 	ReturnValue_t checkInterfaceAndAcquireMessageQueue(
 	        MessageQueueId_t* messageQueueToSet, object_id_t* objectId);