src/fsfw/cfdp/handler/DestHandler.cpp

@@ -356,15 +356,15 @@ ReturnValue_t cfdp::DestHandler::startTransaction(MetadataPduReader& reader,
                              transactionParams.fileSize);
   params.destFileName = transactionParams.destName.data();
   params.sourceFileName = transactionParams.sourceName.data();
-  unsigned tlvIdx = 0;
+  params.numberOfMsgsToUser = 0;
   for (const auto& opt : tlvVec) {
     if (opt.getType() == TlvType::MSG_TO_USER) {
-      msgToUserVec[tlvIdx] = MessageToUserTlv(opt.getValue(), opt.getLengthField());
-      tlvIdx++;
+      msgToUserVec[params.numberOfMsgsToUser] =
+          MessageToUserTlv(opt.getValue(), opt.getLengthField());
+      params.numberOfMsgsToUser++;
     }
   }
   params.msgsToUserArray = msgToUserVec.data();
-  params.msgsToUserLen = tlvIdx;
   destParams.user.metadataRecvdIndication(params);
   return result;
 }

src/fsfw/cfdp/handler/UserBase.h

@@ -35,7 +35,7 @@ struct MetadataRecvdParams {
   Fss fileSize{};
   const char* sourceFileName = "";
   const char* destFileName = "";
-  size_t msgsToUserLen = 0;
+  size_t numberOfMsgsToUser = 0;
   const MessageToUserTlv* msgsToUserArray = nullptr;
 };