Skip to content

Commit

Permalink
Merge pull request #105 from thnkslprpt/fix-104-make-padding-explicit…
Browse files Browse the repository at this point in the history
…-in-fm-msg

Fix #104, Make padding explicit in `FM_MonitorReportEntry_t` & `FM_ChildQueueEntry_t`
  • Loading branch information
dzbaker authored Jun 8, 2023
2 parents 9a578cb + 4842063 commit 98283b6
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions fsw/inc/fm_msg.h
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,7 @@ typedef struct
typedef struct
{
uint8 ReportType;
uint8 Padding[7]; /**< \brief Padding to align Name (and subsequent members) to 64-bit boundaries */
char Name[OS_MAX_PATH_LEN]; /**< \brief File system name */
uint64 Blocks; /**< \brief Block count from last check/poll, 0 if unknown */
uint64 Bytes; /**< \brief Byte count from last check/poll, 0 if unknown */
Expand Down Expand Up @@ -656,6 +657,7 @@ typedef struct
typedef struct
{
CFE_MSG_FcnCode_t CommandCode; /**< \brief Command code - identifies the command */
uint16 Padding1; /**< \brief Structure padding to align to 32-bit boundaries */
uint32 DirListOffset; /**< \brief Starting entry for dir list commands */
uint32 FileInfoState; /**< \brief File info state */
uint32 FileInfoSize; /**< \brief File info size */
Expand All @@ -665,6 +667,7 @@ typedef struct
char Source2[OS_MAX_PATH_LEN]; /**< \brief Second source filename command argument */
char Target[OS_MAX_PATH_LEN]; /**< \brief Target filename command argument */
uint8 GetSizeTimeMode; /**< \brief Whether to invoke stat call for size and time (CPU intensive) */
uint8 Padding2[3]; /**< \brief Structure padding to align to 32-bit boundaries */
uint32 Mode; /**< \brief File Mode */
} FM_ChildQueueEntry_t;

Expand Down

0 comments on commit 98283b6

Please sign in to comment.