PRIVATE->private and PROTECTED->protected updates in Svc/File* (#3446)

Author: m-aleem

Svc/FileDownlink/FileDownlink.hpp

@@ -26,7 +26,9 @@ namespace Svc {
     public FileDownlinkComponentBase
   {
 
-    PRIVATE:
+    friend class FileDownlinkTester;
+
+    private:
 
       // ----------------------------------------------------------------------
       // Types
@@ -35,6 +37,8 @@ namespace Svc {
       //! The Mode class
       class Mode {
 
+        friend class FileDownlinkTester;
+
         public:
 
           //! The Mode type
@@ -74,12 +78,14 @@ namespace Svc {
       //! Class representing an outgoing file
       class File {
 
+        friend class FileDownlinkTester;
+
         public:
 
           //! Constructor
           File() : m_size(0) { }
 
-        PRIVATE:
+        private:
 
           //! The source file name
           Fw::LogStringArg m_sourceName;
@@ -140,6 +146,8 @@ namespace Svc {
       //! Class to record files sent
       class FilesSent {
 
+        friend class FileDownlinkTester;
+
         public:
 
           //! Construct a FilesSent object
@@ -156,7 +164,7 @@ namespace Svc {
             this->m_fileDownlink->tlmWrite_FilesSent(m_sent_file_count);
           }
 
-        PRIVATE:
+        private:
 
           //! The total number of file sent
           U32 m_sent_file_count;
@@ -169,6 +177,8 @@ namespace Svc {
       //! Class to record packets sent
       class PacketsSent {
 
+        friend class FileDownlinkTester;
+
         public:
 
           //! Construct a PacketsSent object
@@ -185,7 +195,7 @@ namespace Svc {
             this->m_fileDownlink->tlmWrite_PacketsSent(m_sent_packet_count);
           }
 
-        PRIVATE:
+        private:
 
           //! The total number of downlinked packets
           U32 m_sent_packet_count;
@@ -198,6 +208,8 @@ namespace Svc {
       //! Class to record warnings
       class Warnings {
 
+        friend class FileDownlinkTester;
+
         public:
 
           //! Construct a Warnings object
@@ -214,15 +226,15 @@ namespace Svc {
           //! Issue a File Read Error warning
           void fileRead(const Os::File::Status status);
 
-        PRIVATE:
+        private:
 
           //! Record a warning
           void warning() {
             ++this->m_warning_count;
             this->m_fileDownlink->tlmWrite_Warnings(m_warning_count);
           }
 
-        PRIVATE:
+        private:
 
           //! The total number of warnings
           U32 m_warning_count;
@@ -287,7 +299,7 @@ namespace Svc {
       //!
       ~FileDownlink();
 
-    PRIVATE:
+    private:
 
       // ----------------------------------------------------------------------
       // Handler implementations for user-defined typed input ports
@@ -327,7 +339,7 @@ namespace Svc {
 
 
 
-    PRIVATE:
+    private:
 
       // ----------------------------------------------------------------------
       // Command handler implementations
@@ -361,7 +373,7 @@ namespace Svc {
       );
 
 
-    PRIVATE:
+    private:
 
       // ----------------------------------------------------------------------
       // Private helper methods
@@ -397,7 +409,7 @@ namespace Svc {
       //Send response after completing file downlink
       void sendResponse(SendFileStatus resp);
 
-    PRIVATE:
+    private:
 
       // ----------------------------------------------------------------------
       // Member variables

Svc/FileManager/FileManager.hpp

@@ -38,7 +38,7 @@ namespace Svc {
       //!
       ~FileManager();
 
-    PRIVATE:
+    private:
 
       // ----------------------------------------------------------------------
       // Command handler implementations
@@ -111,7 +111,7 @@ namespace Svc {
           U32 key /*!< Value to return to pinger*/
       );
 
-    PRIVATE:
+    private:
 
       // ----------------------------------------------------------------------
       // Helper methods
@@ -138,7 +138,7 @@ namespace Svc {
           const Os::FileSystem::Status status //!< The status
       );
 
-    PRIVATE:
+    private:
 
       // ----------------------------------------------------------------------
       // Variables

Svc/FileUplink/FileUplink.hpp

@@ -23,7 +23,9 @@ namespace Svc {
     public FileUplinkComponentBase
   {
 
-    PRIVATE:
+    friend class FileUplinkTester;
+
+    private:
 
       // ----------------------------------------------------------------------
       // Types
@@ -35,6 +37,8 @@ namespace Svc {
       //! An object representing an incoming file
       class File {
 
+        friend class FileUplinkTester;
+
         public:
 
           //! The file size
@@ -46,7 +50,7 @@ namespace Svc {
           //! The underlying OS file
           Os::File osFile;
 
-        PRIVATE:
+        private:
 
           //! The checksum for the file
           ::CFDP::Checksum m_checksum;
@@ -75,6 +79,8 @@ namespace Svc {
       //! Object to record files received
       class FilesReceived {
 
+        friend class FileUplinkTester;
+
         public:
 
           //! Construct a FilesReceived object
@@ -91,7 +97,7 @@ namespace Svc {
             this->m_fileUplink->tlmWrite_FilesReceived(m_received_files_counter);
           }
 
-        PRIVATE:
+        private:
 
           //! The total number of files received
           U32 m_received_files_counter;
@@ -104,6 +110,8 @@ namespace Svc {
       //! Object to record packets received
       class PacketsReceived {
 
+        friend class FileUplinkTester;
+
         public:
 
           //! Construct a PacketsReceived object
@@ -120,7 +128,7 @@ namespace Svc {
             this->m_fileUplink->tlmWrite_PacketsReceived(m_received_packet_count);
           }
 
-        PRIVATE:
+        private:
 
           //! The total number of received packets
           U32 m_received_packet_count;
@@ -133,6 +141,8 @@ namespace Svc {
       //! Object to record warnings
       class Warnings {
 
+        friend class FileUplinkTester;
+
         public:
 
           //! Construct a Warnings object
@@ -175,15 +185,15 @@ namespace Svc {
               const U32 read
           );
 
-        PRIVATE:
+        private:
 
           //! Record a warning
           void warning() {
             ++this->m_warning_count;
             this->m_fileUplink->tlmWrite_Warnings(m_warning_count);
           }
 
-        PRIVATE:
+        private:
 
           //! The total number of warnings
           U32 m_warning_count;
@@ -209,7 +219,7 @@ namespace Svc {
       //!
       ~FileUplink();
 
-    PRIVATE:
+    private:
 
       // ----------------------------------------------------------------------
       // Handler implementations for user-defined typed input ports
@@ -230,7 +240,7 @@ namespace Svc {
       );
 
 
-    PRIVATE:
+    private:
 
       // ----------------------------------------------------------------------
       // Private helper functions
@@ -263,7 +273,7 @@ namespace Svc {
       //! Go to DATA mode
       void goToDataMode();
 
-    PRIVATE:
+    private:
 
       // ----------------------------------------------------------------------
       // Member variables