From 720c2eb3e84901ef40af1480dd2603a8a405fb23 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Thu, 24 Mar 2022 08:27:21 -0600 Subject: [PATCH] Fix #210, Apply clang-format-10 whitespace formatting --- fsw/src/cf_app.c | 2 +- fsw/src/cf_cfdp.c | 18 +- fsw/src/cf_cfdp_dispatch.c | 2 +- fsw/src/cf_cfdp_r.c | 12 +- fsw/src/cf_cfdp_r.h | 2 +- fsw/src/cf_cfdp_s.c | 8 +- fsw/src/cf_cfdp_sbintf.c | 6 +- fsw/src/cf_cfdp_types.h | 6 +- fsw/src/cf_chunk.c | 4 +- fsw/src/cf_chunk.h | 2 +- fsw/src/cf_cmd.c | 6 +- fsw/src/cf_codec.c | 8 +- fsw/src/cf_codec.h | 4 +- fsw/src/cf_logical_pdu.h | 2 +- fsw/src/cf_utils.c | 12 +- fsw/src/cf_utils.h | 6 +- unit-test/cf_app_tests.c | 10 +- unit-test/cf_cfdp_dispatch_tests.c | 16 +- unit-test/cf_cfdp_r_tests.c | 30 +- unit-test/cf_cfdp_s_tests.c | 16 +- unit-test/cf_cfdp_sbintf_tests.c | 10 +- unit-test/cf_cfdp_tests.c | 80 +++--- unit-test/cf_chunk_tests.c | 132 ++++----- unit-test/cf_clist_tests.c | 162 +++++------ unit-test/cf_cmd_tests.c | 336 +++++++++++----------- unit-test/cf_crc_tests.c | 18 +- unit-test/cf_utils_tests.c | 92 +++--- unit-test/stubs/cf_cfdp_handlers.c | 4 +- unit-test/utilities/cf_test_alt_handler.c | 2 +- unit-test/utilities/cf_test_utils.c | 4 +- unit-test/utilities/cf_test_utils.h | 38 +-- unit-test/utilities/ut_utils_cfe_hooks.h | 6 +- 32 files changed, 530 insertions(+), 526 deletions(-) diff --git a/fsw/src/cf_app.c b/fsw/src/cf_app.c index d7e479cd..32ccf454 100644 --- a/fsw/src/cf_app.c +++ b/fsw/src/cf_app.c @@ -117,7 +117,7 @@ void CF_CheckTables(void) *-----------------------------------------------------------------*/ int32 CF_ValidateConfigTable(void *tbl_ptr) { - CF_ConfigTable_t *tbl = (CF_ConfigTable_t *)tbl_ptr; + CF_ConfigTable_t * tbl = (CF_ConfigTable_t *)tbl_ptr; int32 ret; /* initialized below */ static const int32 no_ticks_per_second = -1; static const int32 crc_alignment = -2; diff --git a/fsw/src/cf_cfdp.c b/fsw/src/cf_cfdp.c index 7a962be6..2609adf2 100644 --- a/fsw/src/cf_cfdp.c +++ b/fsw/src/cf_cfdp.c @@ -500,7 +500,7 @@ CF_SendRet_t CF_CFDP_SendAck(CF_Transaction_t *t, CF_CFDP_AckTxnStatus_t ts, CF_ CF_CFDP_ConditionCode_t cc, CF_EntityId_t peer_eid, CF_TransactionSeq_t tsn) { CF_Logical_PduBuffer_t *ph; - CF_Logical_PduAck_t *ack; + CF_Logical_PduAck_t * ack; CF_SendRet_t ret = CF_SendRet_SUCCESS; CF_EntityId_t src_eid; CF_EntityId_t dst_eid; @@ -992,7 +992,7 @@ int32 CF_CFDP_InitEngine(void) /* initialize all transaction nodes */ int i, j; int chunk_mem_offset = 0; - CF_Transaction_t *t = CF_AppData.engine.transactions; + CF_Transaction_t * t = CF_AppData.engine.transactions; CF_ChunkWrapper_t *c = CF_AppData.engine.chunks; int32 ret = CFE_SUCCESS; @@ -1078,7 +1078,7 @@ int32 CF_CFDP_InitEngine(void) int CF_CFDP_CycleTxFirstActive(CF_CListNode_t *node, void *context) { CF_CFDP_CycleTx_args_t *args = (CF_CFDP_CycleTx_args_t *)context; - CF_Transaction_t *t = container_of(node, CF_Transaction_t, cl_node); + CF_Transaction_t * t = container_of(node, CF_Transaction_t, cl_node); int ret = 1; /* default option is exit traversal */ if (t->flags.com.suspended) @@ -1115,7 +1115,7 @@ int CF_CFDP_CycleTxFirstActive(CF_CListNode_t *node, void *context) *-----------------------------------------------------------------*/ void CF_CFDP_CycleTx(CF_Channel_t *c) { - CF_Transaction_t *t; + CF_Transaction_t * t; CF_CFDP_CycleTx_args_t args; if (CF_AppData.config_table->chan[(c - CF_AppData.engine.channels)].dequeue_enabled) @@ -1162,7 +1162,7 @@ int CF_CFDP_DoTick(CF_CListNode_t *node, void *context) { int ret = CF_CLIST_CONT; /* CF_CLIST_CONT means don't tick one, keep looking for cur */ CF_CFDP_Tick_args_t *args = (CF_CFDP_Tick_args_t *)context; - CF_Transaction_t *t = container_of(node, CF_Transaction_t, cl_node); + CF_Transaction_t * t = container_of(node, CF_Transaction_t, cl_node); if (!args->c->cur || (args->c->cur == t)) { /* found where we left off, so clear that and move on */ @@ -1297,7 +1297,7 @@ int32 CF_CFDP_TxFile(const char *src_filename, const char *dst_filename, CF_CFDP uint8 chan, uint8 priority, CF_EntityId_t dest_id) { CF_Transaction_t *t; - CF_Channel_t *c = &CF_AppData.engine.channels[chan]; + CF_Channel_t * c = &CF_AppData.engine.channels[chan]; CF_Assert(chan < CF_NUM_CHANNELS); int32 ret = CFE_SUCCESS; @@ -1529,10 +1529,10 @@ void CF_CFDP_ProcessPollingDirectories(CF_Channel_t *c) for (i = 0; i < CF_MAX_POLLING_DIR_PER_CHAN; ++i) { - CF_Poll_t *p = &c->poll[i]; + CF_Poll_t * p = &c->poll[i]; int chan_index = (c - CF_AppData.engine.channels); CF_ChannelConfig_t *cc = &CF_AppData.config_table->chan[chan_index]; - CF_PollDir_t *pd = &cc->polldir[i]; + CF_PollDir_t * pd = &cc->polldir[i]; int count_check = 0; if (pd->enabled && pd->interval_sec) @@ -1759,7 +1759,7 @@ void CF_CFDP_DisableEngine(void) { int i, j; static const CF_QueueIdx_t CLOSE_QUEUES[] = {CF_QueueIdx_RX, CF_QueueIdx_TXA, CF_QueueIdx_TXW}; - CF_Channel_t *c; + CF_Channel_t * c; CF_AppData.engine.enabled = 0; diff --git a/fsw/src/cf_cfdp_dispatch.c b/fsw/src/cf_cfdp_dispatch.c index 4f22dd50..777c3ae4 100644 --- a/fsw/src/cf_cfdp_dispatch.c +++ b/fsw/src/cf_cfdp_dispatch.c @@ -104,7 +104,7 @@ void CF_CFDP_S_DispatchRecv(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph, CF_Assert(t->state_data.s.sub_state < CF_TxSubState_NUM_STATES); const CF_CFDP_FileDirectiveDispatchTable_t *substate_tbl; CF_CFDP_StateRecvFunc_t selected_handler; - CF_Logical_PduFileDirectiveHeader_t *fdh; + CF_Logical_PduFileDirectiveHeader_t * fdh; /* send state, so we only care about file directive PDU */ selected_handler = NULL; diff --git a/fsw/src/cf_cfdp_r.c b/fsw/src/cf_cfdp_r.c index 1d215485..bebe9940 100644 --- a/fsw/src/cf_cfdp_r.c +++ b/fsw/src/cf_cfdp_r.c @@ -455,10 +455,10 @@ void CF_CFDP_R2_SubstateRecvFileData(CF_Transaction_t *t, CF_Logical_PduBuffer_t *-----------------------------------------------------------------*/ void CF_CFDP_R2_GapCompute(const CF_ChunkList_t *chunks, const CF_Chunk_t *c, void *opaque) { - CF_GapComputeArgs_t *args = (CF_GapComputeArgs_t *)opaque; + CF_GapComputeArgs_t * args = (CF_GapComputeArgs_t *)opaque; CF_Logical_SegmentRequest_t *pseg; - CF_Logical_SegmentList_t *pseglist; - CF_Logical_PduNak_t *nak; + CF_Logical_SegmentList_t * pseglist; + CF_Logical_PduNak_t * nak; /* This function is only invoked for NAK types */ nak = args->nak; @@ -510,9 +510,9 @@ int CF_CFDP_R_SubstateSendNak(CF_Transaction_t *t) nak->scope_start = 0; cret = CF_ChunkList_ComputeGaps(&t->chunks->chunks, (t->chunks->chunks.count < t->chunks->chunks.max_chunks) - ? t->chunks->chunks.max_chunks - : (t->chunks->chunks.max_chunks - 1), - t->fsize, 0, CF_CFDP_R2_GapCompute, &args); + ? t->chunks->chunks.max_chunks + : (t->chunks->chunks.max_chunks - 1), + t->fsize, 0, CF_CFDP_R2_GapCompute, &args); if (!cret) { diff --git a/fsw/src/cf_cfdp_r.h b/fsw/src/cf_cfdp_r.h index f292b2a6..de6981ae 100644 --- a/fsw/src/cf_cfdp_r.h +++ b/fsw/src/cf_cfdp_r.h @@ -38,7 +38,7 @@ */ typedef struct { - CF_Transaction_t *t; /**< \brief Current transaction being processed */ + CF_Transaction_t * t; /**< \brief Current transaction being processed */ CF_Logical_PduNak_t *nak; /**< \brief Current NAK PDU contents */ } CF_GapComputeArgs_t; diff --git a/fsw/src/cf_cfdp_s.c b/fsw/src/cf_cfdp_s.c index 6e1a692e..b289e821 100644 --- a/fsw/src/cf_cfdp_s.c +++ b/fsw/src/cf_cfdp_s.c @@ -121,11 +121,11 @@ void CF_CFDP_S2_SubstateSendEof(CF_Transaction_t *t) int32 CF_CFDP_S_SendFileData(CF_Transaction_t *t, uint32 foffs, uint32 bytes_to_read, uint8 calc_crc) { int32 ret = -1; - CF_Logical_PduBuffer_t *ph = CF_CFDP_ConstructPduHeader(t, 0, CF_AppData.config_table->local_eid, - t->history->peer_eid, 0, t->history->seq_num, 1); + CF_Logical_PduBuffer_t * ph = CF_CFDP_ConstructPduHeader(t, 0, CF_AppData.config_table->local_eid, + t->history->peer_eid, 0, t->history->seq_num, 1); CF_Logical_PduFileDataHeader_t *fd; size_t actual_bytes; - void *data_ptr; + void * data_ptr; if (!ph) { @@ -494,7 +494,7 @@ void CF_CFDP_S2_Fin(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph) void CF_CFDP_S2_Nak(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph) { const CF_Logical_SegmentRequest_t *sr; - const CF_Logical_PduNak_t *nak; + const CF_Logical_PduNak_t * nak; uint8 counter; uint8 bad_sr; diff --git a/fsw/src/cf_cfdp_sbintf.c b/fsw/src/cf_cfdp_sbintf.c index b791403f..c10fe913 100644 --- a/fsw/src/cf_cfdp_sbintf.c +++ b/fsw/src/cf_cfdp_sbintf.c @@ -62,7 +62,7 @@ CF_Logical_PduBuffer_t *CF_CFDP_MsgOutGet(const CF_Transaction_t *t, bool silent) { /* if channel is frozen, do not take message */ - CF_Channel_t *c = CF_AppData.engine.channels + t->chan_num; + CF_Channel_t * c = CF_AppData.engine.channels + t->chan_num; CF_Logical_PduBuffer_t *ret; /* this function should not be called more than once before the message @@ -162,11 +162,11 @@ void CF_CFDP_Send(uint8 chan_num, const CF_Logical_PduBuffer_t *ph) *-----------------------------------------------------------------*/ void CF_CFDP_ReceiveMessage(CF_Channel_t *c) { - CF_Transaction_t *t; /* initialized below */ + CF_Transaction_t * t; /* initialized below */ uint32 count = 0; int32 status; const int chan_num = (c - CF_AppData.engine.channels); - CFE_SB_Buffer_t *bufptr; + CFE_SB_Buffer_t * bufptr; CFE_MSG_Size_t msg_size; CF_Logical_PduBuffer_t *ph; diff --git a/fsw/src/cf_cfdp_types.h b/fsw/src/cf_cfdp_types.h index f0fa86e3..ad2d409b 100644 --- a/fsw/src/cf_cfdp_types.h +++ b/fsw/src/cf_cfdp_types.h @@ -309,7 +309,7 @@ typedef struct CF_Transaction { CF_TxnState_t state; /**< \brief each engine is commanded to do something, which is the overall state */ - CF_History_t *history; /**< \brief weird, holds active filenames and possibly other info */ + CF_History_t * history; /**< \brief weird, holds active filenames and possibly other info */ CF_ChunkWrapper_t *chunks; /**< \brief for gap tracking, only used on class 2 */ CF_Timer_t inactivity_timer; /**< \brief set to the overall inactivity timer of a remote */ CF_Timer_t ack_timer; /**< \brief called ack_timer, but is also nak_timer */ @@ -439,7 +439,7 @@ typedef struct CF_PduSendMsg */ typedef struct CF_Output { - CFE_SB_Buffer_t *msg; /**< \brief Binary message to be sent to underlying transport */ + CFE_SB_Buffer_t * msg; /**< \brief Binary message to be sent to underlying transport */ CF_EncoderState_t encode; /**< \brief Encoding state (while building message) */ /** @@ -455,7 +455,7 @@ typedef struct CF_Output */ typedef struct CF_Input { - CFE_SB_Buffer_t *msg; /**< \brief Binary message received from underlying transport */ + CFE_SB_Buffer_t * msg; /**< \brief Binary message received from underlying transport */ CF_DecoderState_t decode; /**< \brief Decoding state (while interpreting message) */ /** diff --git a/fsw/src/cf_chunk.c b/fsw/src/cf_chunk.c index 1275629a..b8683e6f 100644 --- a/fsw/src/cf_chunk.c +++ b/fsw/src/cf_chunk.c @@ -147,7 +147,7 @@ int CF_Chunks_CombinePrevious(CF_ChunkList_t *chunks, CF_ChunkIdx_t i, const CF_ if ((i && chunks->count)) { - CF_Chunk_t *prev = &chunks->chunks[i - 1]; + CF_Chunk_t * prev = &chunks->chunks[i - 1]; CF_ChunkOffset_t prev_end = prev->offset + prev->size; if (chunk->offset <= prev_end) { @@ -276,7 +276,7 @@ void CF_Chunks_Insert(CF_ChunkList_t *chunks, CF_ChunkIdx_t i, const CF_Chunk_t else { CF_ChunkIdx_t smallest_i = CF_Chunks_FindSmallestSize(chunks); - CF_Chunk_t *smallest_c = &chunks->chunks[smallest_i]; + CF_Chunk_t * smallest_c = &chunks->chunks[smallest_i]; if (smallest_c->size < chunk->size) { CF_Chunks_EraseChunk(chunks, smallest_i); diff --git a/fsw/src/cf_chunk.h b/fsw/src/cf_chunk.h index aac986fa..2b86d81c 100644 --- a/fsw/src/cf_chunk.h +++ b/fsw/src/cf_chunk.h @@ -50,7 +50,7 @@ typedef struct CF_ChunkList { CF_ChunkIdx_t count; /**< \brief number of chunks currently in the array */ CF_ChunkIdx_t max_chunks; /**< \brief maximum number of chunks allowed in the list (allocation size) */ - CF_Chunk_t *chunks; /**< \brief chunk list array */ + CF_Chunk_t * chunks; /**< \brief chunk list array */ } CF_ChunkList_t; /** diff --git a/fsw/src/cf_cmd.c b/fsw/src/cf_cmd.c index 700f10ff..1afdf0b3 100644 --- a/fsw/src/cf_cmd.c +++ b/fsw/src/cf_cmd.c @@ -388,7 +388,7 @@ void CF_DoSuspRes_Txn(CF_Transaction_t *t, CF_ChanAction_SuspResArg_t *context) void CF_DoSuspRes(CF_TransactionCmd_t *cmd, uint8 action) { /* ok to not bounds check action, because the caller is using it in two places with constant values 0 or 1 */ - static const char *msgstr[] = {"resume", "suspend"}; + static const char * msgstr[] = {"resume", "suspend"}; CF_ChanAction_SuspResArg_t args = {0, action}; int ret = CF_TsnChanAction(cmd, msgstr[action], (CF_TsnChanAction_fn_t)CF_DoSuspRes_Txn, &args); @@ -722,7 +722,7 @@ void CF_CmdWriteQueue(CFE_SB_Buffer_t *msg) static const int q_history = 2; static const int q_all = 3; CF_WriteQueueCmd_t *wq = (CF_WriteQueueCmd_t *)msg; - CF_Channel_t *c = &CF_AppData.engine.channels[wq->chan]; + CF_Channel_t * c = &CF_AppData.engine.channels[wq->chan]; osal_id_t fd; int32 ret; @@ -913,7 +913,7 @@ void CF_CmdGetSetParam(uint8 is_set, CF_GetSet_ValueID_t param_id, uint32 value, bool valid_set; struct { - void *ptr; + void * ptr; uint32 size; int (*fn)(uint32, uint8 chan_num); } item; diff --git a/fsw/src/cf_codec.c b/fsw/src/cf_codec.c index c378bf45..a2e21ab4 100644 --- a/fsw/src/cf_codec.c +++ b/fsw/src/cf_codec.c @@ -498,7 +498,7 @@ void CF_CFDP_EncodeFileDirectiveHeader(CF_EncoderState_t *state, CF_Logical_PduF void CF_CFDP_EncodeLV(CF_EncoderState_t *state, CF_Logical_Lv_t *pllv) { CF_CFDP_lv_t *lv; /* for encoding fixed sized fields */ - void *data_ptr; + void * data_ptr; lv = CF_ENCODE_FIXED_CHUNK(state, CF_CFDP_lv_t); if (lv != NULL) @@ -530,7 +530,7 @@ void CF_CFDP_EncodeLV(CF_EncoderState_t *state, CF_Logical_Lv_t *pllv) void CF_CFDP_EncodeTLV(CF_EncoderState_t *state, CF_Logical_Tlv_t *pltlv) { CF_CFDP_tlv_t *tlv; /* for encoding fixed sized fields */ - void *data_ptr; + void * data_ptr; tlv = CF_ENCODE_FIXED_CHUNK(state, CF_CFDP_tlv_t); if (tlv != NULL) @@ -652,7 +652,7 @@ void CF_CFDP_EncodeMd(CF_EncoderState_t *state, CF_Logical_PduMd_t *plmd) void CF_CFDP_EncodeFileDataHeader(CF_EncoderState_t *state, bool with_meta, CF_Logical_PduFileDataHeader_t *plfd) { CF_CFDP_PduFileDataHeader_t *fd; - CF_CFDP_uint8_t *optional_fields; + CF_CFDP_uint8_t * optional_fields; /* in this packet, the optional fields actually come first */ if (with_meta) @@ -996,7 +996,7 @@ void CF_CFDP_DecodeMd(CF_DecoderState_t *state, CF_Logical_PduMd_t *plmd) void CF_CFDP_DecodeFileDataHeader(CF_DecoderState_t *state, bool with_meta, CF_Logical_PduFileDataHeader_t *plfd) { const CF_CFDP_PduFileDataHeader_t *fd; - const CF_CFDP_uint8_t *optional_fields; + const CF_CFDP_uint8_t * optional_fields; uint8 field_count; plfd->continuation_state = 0; diff --git a/fsw/src/cf_codec.h b/fsw/src/cf_codec.h index ac50aa86..4f50037d 100644 --- a/fsw/src/cf_codec.h +++ b/fsw/src/cf_codec.h @@ -50,7 +50,7 @@ typedef struct CF_CodecState typedef struct CF_EncoderState { CF_CodecState_t codec_state; /**< \brief Common state */ - uint8 *base; /**< \brief Pointer to start of encoded PDU data */ + uint8 * base; /**< \brief Pointer to start of encoded PDU data */ } CF_EncoderState_t; /** @@ -61,7 +61,7 @@ typedef struct CF_EncoderState typedef struct CF_DecoderState { CF_CodecState_t codec_state; /**< \brief Common state */ - const uint8 *base; /**< \brief Pointer to start of encoded PDU data */ + const uint8 * base; /**< \brief Pointer to start of encoded PDU data */ } CF_DecoderState_t; /********************************************************************************* diff --git a/fsw/src/cf_logical_pdu.h b/fsw/src/cf_logical_pdu.h index d06b42e7..8aaa0e8f 100644 --- a/fsw/src/cf_logical_pdu.h +++ b/fsw/src/cf_logical_pdu.h @@ -163,7 +163,7 @@ typedef struct CF_Logical_Lv typedef union CF_Logical_TlvData { CF_EntityId_t eid; /**< \brief Valid when type=ENTITY_ID (6) */ - const void *data_ptr; /**< \brief Source of actual data in original location (other string/binary types) */ + const void * data_ptr; /**< \brief Source of actual data in original location (other string/binary types) */ } CF_Logical_TlvData_t; diff --git a/fsw/src/cf_utils.c b/fsw/src/cf_utils.c index 363cd4e5..83856eed 100644 --- a/fsw/src/cf_utils.c +++ b/fsw/src/cf_utils.c @@ -50,7 +50,7 @@ CF_Transaction_t *CF_FindUnusedTransaction(CF_Channel_t *c) { int q_index; /* initialized below in if */ - CF_CListNode_t *n = c->qs[CF_QueueIdx_FREE]; + CF_CListNode_t * n = c->qs[CF_QueueIdx_FREE]; CF_Transaction_t *t = container_of(n, CF_Transaction_t, cl_node); CF_CList_Remove_Ex(c, CF_QueueIdx_FREE, &t->cl_node); @@ -152,10 +152,10 @@ CF_Transaction_t *CF_FindTransactionBySequenceNumber(CF_Channel_t *c, CF_Transac * * Let's put CF_QueueIdx_RX up front, because most RX packets will be file data PDUs */ CF_Traverse_TransSeqArg_t ctx = {transaction_sequence_number, src_eid, NULL}; - CF_CListNode_t *ptrs[] = {c->qs[CF_QueueIdx_RX], c->qs[CF_QueueIdx_PEND], c->qs[CF_QueueIdx_TXA], + CF_CListNode_t * ptrs[] = {c->qs[CF_QueueIdx_RX], c->qs[CF_QueueIdx_PEND], c->qs[CF_QueueIdx_TXA], c->qs[CF_QueueIdx_TXW]}; int i; - CF_Transaction_t *ret = NULL; + CF_Transaction_t * ret = NULL; for (i = 0; i < (sizeof(ptrs) / sizeof(ptrs[0])); ++i) { @@ -229,7 +229,7 @@ int CF_WriteHistoryEntryToFile(osal_id_t fd, const CF_History_t *h) int CF_Traverse_WriteHistoryQueueEntryToFile(CF_CListNode_t *n, void *arg) { CF_Traverse_WriteHistoryFileArg_t *context = arg; - CF_History_t *h = container_of(n, CF_History_t, cl_node); + CF_History_t * h = container_of(n, CF_History_t, cl_node); /* if filter_dir is CF_Direction_NUM, this means both directions (all match) */ if (context->filter_dir == CF_Direction_NUM || h->dir == context->filter_dir) @@ -258,7 +258,7 @@ int CF_Traverse_WriteHistoryQueueEntryToFile(CF_CListNode_t *n, void *arg) int CF_Traverse_WriteTxnQueueEntryToFile(CF_CListNode_t *n, void *arg) { CF_Traverse_WriteTxnFileArg_t *context = arg; - CF_Transaction_t *t = container_of(n, CF_Transaction_t, cl_node); + CF_Transaction_t * t = container_of(n, CF_Transaction_t, cl_node); if (CF_WriteHistoryEntryToFile(context->fd, t->history) < 0) { @@ -322,7 +322,7 @@ int32 CF_WriteHistoryQueueDataToFile(osal_id_t fd, CF_Channel_t *c, CF_Direction *-----------------------------------------------------------------*/ int CF_PrioSearch(CF_CListNode_t *node, void *context) { - CF_Transaction_t *t = container_of(node, CF_Transaction_t, cl_node); + CF_Transaction_t * t = container_of(node, CF_Transaction_t, cl_node); CF_Traverse_PriorityArg_t *p = (CF_Traverse_PriorityArg_t *)context; if (t->priority <= p->priority) diff --git a/fsw/src/cf_utils.h b/fsw/src/cf_utils.h index f98d8be5..4065e736 100644 --- a/fsw/src/cf_utils.h +++ b/fsw/src/cf_utils.h @@ -40,7 +40,7 @@ typedef struct CF_Traverse_TransSeqArg { CF_TransactionSeq_t transaction_sequence_number; CF_EntityId_t src_eid; - CF_Transaction_t *t; /**< \brief output transaction pointer */ + CF_Transaction_t * t; /**< \brief output transaction pointer */ } CF_Traverse_TransSeqArg_t; /** @@ -95,7 +95,7 @@ typedef void (*CF_TraverseAllTransactions_fn_t)(CF_Transaction_t *t, void *conte typedef struct CF_TraverseAll_Arg { CF_TraverseAllTransactions_fn_t fn; /**< \brief internal callback to use for each CList_Traverse */ - void *context; /**< \brief opaque object to pass to internal callback */ + void * context; /**< \brief opaque object to pass to internal callback */ int counter; /**< \brief Running tally of all nodes traversed from all lists */ } CF_TraverseAll_Arg_t; @@ -106,7 +106,7 @@ typedef struct CF_TraverseAll_Arg */ typedef struct CF_Traverse_PriorityArg { - CF_Transaction_t *t; /**< \brief OUT: holds value of transaction with which to call CF_CList_InsertAfter on */ + CF_Transaction_t *t; /**< \brief OUT: holds value of transaction with which to call CF_CList_InsertAfter on */ uint8 priority; /**< \brief seeking this priority */ } CF_Traverse_PriorityArg_t; diff --git a/unit-test/cf_app_tests.c b/unit-test/cf_app_tests.c index c18394cf..3e4ac3e3 100644 --- a/unit-test/cf_app_tests.c +++ b/unit-test/cf_app_tests.c @@ -612,9 +612,9 @@ void Test_CF_ProcessMsg_ProcessGroundCommand(void) { /* Arrange */ CFE_SB_Buffer_t dummy_msg; - CFE_SB_Buffer_t *arg_msg = &dummy_msg; + CFE_SB_Buffer_t * arg_msg = &dummy_msg; CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(CF_CMD_MID); - CFE_SB_Buffer_t *context_CF_ProcessGroundCommand_msg; + CFE_SB_Buffer_t * context_CF_ProcessGroundCommand_msg; CFE_MSG_GetMsgId_context_t context_CFE_MSG_GetMsgId; /* CFE_MSG_GetMsgId uses return by ref */ @@ -638,7 +638,7 @@ void Test_CF_ProcessMsg_WakeUp(void) { /* Arrange */ CFE_SB_Buffer_t dummy_msg; - CFE_SB_Buffer_t *arg_msg = &dummy_msg; + CFE_SB_Buffer_t * arg_msg = &dummy_msg; CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(CF_WAKE_UP_MID); CFE_MSG_GetMsgId_context_t context_CFE_MSG_GetMsgId; @@ -662,7 +662,7 @@ void Test_CF_ProcessMsg_SendHk(void) /* TODO: figure out if message is required here - not used at time of writing this */ // CFE_MSG_Message_t dummy_Msg; // CFE_SB_Buffer_t dummy_msg; - CFE_SB_Buffer_t *arg_msg = NULL; + CFE_SB_Buffer_t * arg_msg = NULL; CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(CF_SEND_HK_MID); CFE_MSG_GetMsgId_context_t context_CFE_MSG_GetMsgId; @@ -692,7 +692,7 @@ void Test_CF_ProcessMsg_UnrecognizedCommandEnterDefaultPath(void) uint16 initial_err_count = CF_AppData.hk.counters.err; CFE_SB_MsgId_Atom_t midval; CFE_SB_MsgId_t forced_MsgID; - CFE_SB_Buffer_t *arg_msg = NULL; + CFE_SB_Buffer_t * arg_msg = NULL; CFE_MSG_GetMsgId_context_t context_CFE_MSG_GetMsgId; CFE_EVS_SendEvent_context_t context_CFE_EVS_SendEvent; diff --git a/unit-test/cf_cfdp_dispatch_tests.c b/unit-test/cf_cfdp_dispatch_tests.c index 3c1b1ab7..8734fe6c 100644 --- a/unit-test/cf_cfdp_dispatch_tests.c +++ b/unit-test/cf_cfdp_dispatch_tests.c @@ -131,8 +131,8 @@ void Test_CF_CFDP_R_DispatchRecv(void) * void CF_CFDP_R_DispatchRecv(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph, const * CF_CFDP_R_SubstateDispatchTable_t *dispatch, CF_CFDP_StateRecvFunc_t fd_fn); */ - CF_Transaction_t *t; - CF_Logical_PduBuffer_t *ph; + CF_Transaction_t * t; + CF_Logical_PduBuffer_t * ph; CF_CFDP_R_SubstateDispatchTable_t dispatch; CF_CFDP_FileDirectiveDispatchTable_t fddt; @@ -189,8 +189,8 @@ void Test_CF_CFDP_S_DispatchRecv(void) * void CF_CFDP_S_DispatchRecv(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph, const CF_CFDP_S_SubstateRecvDispatchTable_t *dispatch) */ - CF_Transaction_t *t; - CF_Logical_PduBuffer_t *ph; + CF_Transaction_t * t; + CF_Logical_PduBuffer_t * ph; CF_CFDP_S_SubstateRecvDispatchTable_t dispatch; CF_CFDP_FileDirectiveDispatchTable_t fddt; @@ -230,7 +230,7 @@ void Test_CF_CFDP_S_DispatchTransmit(void) /* Test case for: * void CF_CFDP_S_DispatchTransmit(CF_Transaction_t *t, const CF_CFDP_S_SubstateSendDispatchTable_t *dispatch); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_CFDP_S_SubstateSendDispatchTable_t dispatch; /* The CF_CFDP_S2_Tx is just used as a convenient stub to target */ @@ -253,7 +253,7 @@ void Test_CF_CFDP_TxStateDispatch(void) /* Test case for: * void CF_CFDP_TxStateDispatch(CF_Transaction_t *t, const CF_CFDP_TxnSendDispatchTable_t *dispatch); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_CFDP_TxnSendDispatchTable_t dispatch; memset(&dispatch, 0, sizeof(dispatch)); @@ -277,8 +277,8 @@ void Test_CF_CFDP_RxStateDispatch(void) * void CF_CFDP_RxStateDispatch(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph, const * CF_CFDP_TxnRecvDispatchTable_t *dispatch); */ - CF_Transaction_t *t; - CF_Logical_PduBuffer_t *ph; + CF_Transaction_t * t; + CF_Logical_PduBuffer_t * ph; CF_CFDP_TxnRecvDispatchTable_t dispatch; memset(&dispatch, 0, sizeof(dispatch)); diff --git a/unit-test/cf_cfdp_r_tests.c b/unit-test/cf_cfdp_r_tests.c index 8b2d4319..2a509f56 100644 --- a/unit-test/cf_cfdp_r_tests.c +++ b/unit-test/cf_cfdp_r_tests.c @@ -150,7 +150,7 @@ void Test_CF_CFDP_R1_Recv(void) * void CF_CFDP_R1_Recv(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; UT_CFDP_R_SetupBasicTestState(UT_CF_Setup_RX, &ph, NULL, NULL, &t, NULL); @@ -163,7 +163,7 @@ void Test_CF_CFDP_R2_Recv(void) /* Test case for: * void CF_CFDP_R2_Recv(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; UT_CFDP_R_SetupBasicTestState(UT_CF_Setup_RX, &ph, NULL, NULL, &t, NULL); @@ -541,8 +541,8 @@ void Test_CF_CFDP_R_ProcessFd(void) /* Test case for: * int CF_CFDP_R_ProcessFd(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; - CF_Logical_PduBuffer_t *ph; + CF_Transaction_t * t; + CF_Logical_PduBuffer_t * ph; CF_Logical_PduFileDataHeader_t *fd; /* nominal */ @@ -603,9 +603,9 @@ void Test_CF_CFDP_R_SubstateRecvEof(void) /* Test case for: * int CF_CFDP_R_SubstateRecvEof(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; - CF_Logical_PduEof_t *eof; + CF_Logical_PduEof_t * eof; /* nominal */ UT_CFDP_R_SetupBasicTestState(UT_CF_Setup_RX, &ph, NULL, NULL, &t, NULL); @@ -644,9 +644,9 @@ void Test_CF_CFDP_R1_SubstateRecvEof(void) /* Test case for: * void CF_CFDP_R1_SubstateRecvEof(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; - CF_Logical_PduEof_t *eof; + CF_Logical_PduEof_t * eof; /* nominal */ UT_CFDP_R_SetupBasicTestState(UT_CF_Setup_RX, &ph, NULL, NULL, &t, NULL); @@ -679,9 +679,9 @@ void Test_CF_CFDP_R2_SubstateRecvEof(void) /* Test case for: * void CF_CFDP_R2_SubstateRecvEof(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; - CF_Logical_PduEof_t *eof; + CF_Logical_PduEof_t * eof; /* nominal */ UT_CFDP_R_SetupBasicTestState(UT_CF_Setup_RX, &ph, NULL, NULL, &t, NULL); @@ -734,7 +734,7 @@ void Test_CF_CFDP_R1_SubstateRecvFileData(void) /* Test case for: * void CF_CFDP_R1_SubstateRecvFileData(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* nominal */ @@ -760,7 +760,7 @@ void Test_CF_CFDP_R2_SubstateRecvFileData(void) /* Test case for: * void CF_CFDP_R2_SubstateRecvFileData(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* nominal */ @@ -839,7 +839,7 @@ void Test_CF_CFDP_R_SubstateSendNak(void) /* Test case for: * int CF_CFDP_R_SubstateSendNak(CF_Transaction_t *t); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; CF_ChunkWrapper_t chunks; @@ -1017,7 +1017,7 @@ void Test_CF_CFDP_R2_Recv_fin_ack(void) /* Test case for: * void CF_CFDP_R2_Recv_fin_ack(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* nominal */ @@ -1038,7 +1038,7 @@ void Test_CF_CFDP_R2_RecvMd(void) /* Test case for: * void CF_CFDP_R2_RecvMd(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* nominal */ diff --git a/unit-test/cf_cfdp_s_tests.c b/unit-test/cf_cfdp_s_tests.c index 29e6993c..6342b3f0 100644 --- a/unit-test/cf_cfdp_s_tests.c +++ b/unit-test/cf_cfdp_s_tests.c @@ -172,7 +172,7 @@ void Test_CF_CFDP_S1_Recv(void) /* Test case for: * void CF_CFDP_S1_Recv(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* class 1 recv is really a noop, it basically drops all packets. @@ -186,7 +186,7 @@ void Test_CF_CFDP_S2_Recv(void) /* Test case for: * void CF_CFDP_S2_Recv(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* class 2 recv just invokes a dispatcher to functions that should be @@ -729,7 +729,7 @@ void Test_CF_CFDP_S2_EarlyFin(void) /* Test case for: * void CF_CFDP_S2_EarlyFin(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* nominal */ @@ -742,7 +742,7 @@ void Test_CF_CFDP_S2_Fin(void) /* Test case for: * void CF_CFDP_S2_Fin(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* nominal */ @@ -755,9 +755,9 @@ void Test_CF_CFDP_S2_Nak(void) /* Test case for: * void CF_CFDP_S2_Nak(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; - CF_Logical_PduNak_t *nak; + CF_Logical_PduNak_t * nak; /* no segments */ UT_CFDP_S_SetupBasicTestState(UT_CF_Setup_RX, &ph, NULL, NULL, &t, NULL); @@ -811,7 +811,7 @@ void Test_CF_CFDP_S2_Nak_Arm(void) /* Test case for: * void CF_CFDP_S2_Nak_Arm(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* nominal */ @@ -824,7 +824,7 @@ void Test_CF_CFDP_S2_WaitForEofAck(void) /* Test case for: * void CF_CFDP_S2_WaitForEofAck(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* nominal */ diff --git a/unit-test/cf_cfdp_sbintf_tests.c b/unit-test/cf_cfdp_sbintf_tests.c index cd830a9b..8bc01aca 100644 --- a/unit-test/cf_cfdp_sbintf_tests.c +++ b/unit-test/cf_cfdp_sbintf_tests.c @@ -48,7 +48,7 @@ static void UT_CFDP_SetupBasicRxState(CF_Logical_PduBuffer_t *pdu_buffer) { static CF_DecoderState_t ut_decoder; static uint8 bytes[CF_CFDP_MAX_HEADER_SIZE]; - CFE_SB_Buffer_t *bufptr; + CFE_SB_Buffer_t * bufptr; CFE_MSG_Size_t sz; memset(pdu_buffer, 0, sizeof(*pdu_buffer)); @@ -212,9 +212,9 @@ void Test_CF_CFDP_ReceiveMessage(void) /* Test case for: * void CF_CFDP_ReceiveMessage(CF_Channel_t *c); */ - CF_Channel_t *c; - CF_ConfigTable_t *config; - CF_Transaction_t *t; + CF_Channel_t * c; + CF_ConfigTable_t * config; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* no-config - the max per wakeup will be 0, and this is a noop */ @@ -327,7 +327,7 @@ void Test_CF_CFDP_MsgOutGet(void) */ CF_Transaction_t *t; CF_ConfigTable_t *config; - CF_Channel_t *c; + CF_Channel_t * c; /* nominal */ UT_CFDP_SetupBasicTestState(UT_CF_Setup_TX, NULL, NULL, NULL, &t, NULL); diff --git a/unit-test/cf_cfdp_tests.c b/unit-test/cf_cfdp_tests.c index 6b061359..cba9441b 100644 --- a/unit-test/cf_cfdp_tests.c +++ b/unit-test/cf_cfdp_tests.c @@ -287,10 +287,10 @@ void Test_CF_CFDP_RecvMd(void) /* Test case for: * int CF_CFDP_RecvMd(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph) */ - CF_Transaction_t *t; - CF_History_t *h; + CF_Transaction_t * t; + CF_History_t * h; CF_Logical_PduBuffer_t *ph; - CF_Logical_PduMd_t *md; + CF_Logical_PduMd_t * md; const char src[] = "mds"; const char dest[] = "mdd"; @@ -335,7 +335,7 @@ void Test_CF_CFDP_RecvFd(void) /* Test case for: * int CF_CFDP_RecvFd(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph) */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* nominal call, no crc */ @@ -375,7 +375,7 @@ void Test_CF_CFDP_RecvEof(void) * int CF_CFDP_RecvEof(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph) */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* nominal call */ @@ -394,7 +394,7 @@ void Test_CF_CFDP_RecvAck(void) /* Test case for: * int CF_CFDP_RecvAck(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph) */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* nominal call */ @@ -414,7 +414,7 @@ void Test_CF_CFDP_RecvFin(void) * int CF_CFDP_RecvFin(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph) */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* nominal call */ @@ -434,7 +434,7 @@ void Test_CF_CFDP_RecvNak(void) * int CF_CFDP_RecvNak(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph) */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* nominal call */ @@ -453,7 +453,7 @@ void Test_CF_CFDP_RecvDrop(void) /* Test case for: * void CF_CFDP_RecvDrop(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; /* nominal call */ @@ -465,8 +465,8 @@ void Test_CF_CFDP_RecvIdle(void) /* Test case for: * void CF_CFDP_RecvIdle(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; - CF_History_t *h; + CF_Transaction_t * t; + CF_History_t * h; CF_Logical_PduBuffer_t *ph; CF_ChunkWrapper_t ut_unused_chunks; @@ -543,7 +543,7 @@ CF_Logical_PduBuffer_t *CF_CFDP_ConstructPduHeader(const CF_Transaction_t *t, CF CF_EntityId_t src_eid, CF_EntityId_t dst_eid, bool towards_sender, CF_TransactionSeq_t tsn, bool silent); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; CF_Logical_PduHeader_t *hdr; @@ -590,10 +590,10 @@ void Test_CF_CFDP_SendMd(void) CF_SendRet_t CF_CFDP_SendMd(CF_Transaction_t *t); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; - CF_History_t *h; - CF_Logical_PduMd_t *md; + CF_History_t * h; + CF_Logical_PduMd_t * md; /* setup without a tx message */ UT_CFDP_SetupBasicTestState(UT_CF_Setup_NONE, NULL, NULL, NULL, &t, NULL); @@ -631,7 +631,7 @@ void Test_CF_CFDP_SendFd(void) CF_SendRet_t CF_CFDP_SendFd(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; UT_CFDP_SetupBasicTestState(UT_CF_Setup_TX, &ph, NULL, NULL, &t, NULL); @@ -644,10 +644,10 @@ void Test_CF_CFDP_SendEof(void) CF_SendRet_t CF_CFDP_SendEof(CF_Transaction_t *t); */ - CF_Transaction_t *t; - CF_History_t *h; + CF_Transaction_t * t; + CF_History_t * h; CF_Logical_PduBuffer_t *ph; - CF_Logical_PduEof_t *eof; + CF_Logical_PduEof_t * eof; /* setup without a tx message */ UT_CFDP_SetupBasicTestState(UT_CF_Setup_NONE, NULL, NULL, NULL, &t, NULL); @@ -675,9 +675,9 @@ void Test_CF_CFDP_SendAck(void) CF_CFDP_ConditionCode_t cc, CF_EntityId_t peer_eid, CF_TransactionSeq_t tsn); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; - CF_Logical_PduAck_t *ack; + CF_Logical_PduAck_t * ack; /* setup without a tx message */ UT_CFDP_SetupBasicTestState(UT_CF_Setup_NONE, NULL, NULL, NULL, &t, NULL); @@ -729,9 +729,9 @@ void Test_CF_CFDP_SendFin(void) CF_CFDP_ConditionCode_t cc); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; - CF_Logical_PduFin_t *fin; + CF_Logical_PduFin_t * fin; /* setup without a tx message */ UT_CFDP_SetupBasicTestState(UT_CF_Setup_NONE, NULL, NULL, NULL, &t, NULL); @@ -768,7 +768,7 @@ void Test_CF_CFDP_SendNak(void) /* Test case for: CF_SendRet_t CF_CFDP_SendNak(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; UT_CFDP_SetupBasicTestState(UT_CF_Setup_NONE, &ph, NULL, NULL, &t, NULL); @@ -789,8 +789,8 @@ void Test_CF_CFDP_AppendTlv(void) This helper is used by EOF and FIN to set TLV values */ CF_Logical_PduBuffer_t *ph; - CF_ConfigTable_t *config; - CF_Logical_TlvList_t *tlv_list; + CF_ConfigTable_t * config; + CF_Logical_TlvList_t * tlv_list; UT_CFDP_SetupBasicTestState(UT_CF_Setup_TX, &ph, NULL, NULL, NULL, &config); config->local_eid = 123; @@ -816,7 +816,7 @@ void Test_CF_CFDP_FindUnusedTransaction(void) /* Test case for: CF_Transaction_t *CF_CFDP_FindUnusedTransaction(CF_Channel_t *c) */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Logical_PduBuffer_t *ph; UT_CFDP_SetupBasicTestState(UT_CF_Setup_NONE, &ph, NULL, NULL, &t, NULL); @@ -876,9 +876,9 @@ void Test_CF_CFDP_TxFile(void) */ const char src[] = "tsrc"; const char dest[] = "tdest"; - CF_History_t *h; + CF_History_t * h; CF_Transaction_t *t; - CF_Channel_t *c; + CF_Channel_t * c; CF_ChunkWrapper_t chunk_wrap; memset(&chunk_wrap, 0, sizeof(chunk_wrap)); @@ -924,7 +924,7 @@ void Test_CF_CFDP_PlaybackDir(void) const char src[] = "psrc"; const char dest[] = "pdest"; CF_Playback_t *pb; - CF_Channel_t *c; + CF_Channel_t * c; uint8 i; /* nominal call */ @@ -972,7 +972,7 @@ void Test_CF_CFDP_CycleTx(void) /* Test case for: * void CF_CFDP_CycleTx(CF_Channel_t *c) */ - CF_Channel_t *c; + CF_Channel_t * c; CF_Transaction_t *t; CF_ConfigTable_t *config; CF_Transaction_t t2; @@ -1016,7 +1016,7 @@ void Test_CF_CFDP_CycleTxFirstActive(void) int CF_CFDP_CycleTxFirstActive(CF_CListNode_t *node, void *context); */ CF_CFDP_CycleTx_args_t args; - CF_Transaction_t *t; + CF_Transaction_t * t; memset(&args, 0, sizeof(args)); @@ -1058,7 +1058,7 @@ void Test_CF_CFDP_DoTick(void) /* Test case for: * int CF_CFDP_DoTick(CF_CListNode_t *node, void *context); */ - CF_Transaction_t *t; + CF_Transaction_t * t; CF_Transaction_t t2; CF_CFDP_Tick_args_t args; @@ -1094,10 +1094,10 @@ void Test_CF_CFDP_ProcessPollingDirectories(void) /* Test case for: * void CF_CFDP_ProcessPollingDirectories(CF_Channel_t *c) */ - CF_Channel_t *c; + CF_Channel_t * c; CF_ConfigTable_t *config; - CF_PollDir_t *pdcfg; - CF_Poll_t *poll; + CF_PollDir_t * pdcfg; + CF_Poll_t * poll; UT_CFDP_SetupBasicTestState(UT_CF_Setup_TX, NULL, &c, NULL, NULL, &config); pdcfg = &config->chan[UT_CFDP_CHANNEL].polldir[0]; @@ -1169,8 +1169,8 @@ void Test_CF_CFDP_ProcessPlaybackDirectory(void) * void CF_CFDP_ProcessPlaybackDirectory(CF_Channel_t *c, CF_Playback_t *p) */ CF_Transaction_t *t; - CF_History_t *h; - CF_Channel_t *c; + CF_History_t * h; + CF_Channel_t * c; CF_ConfigTable_t *config; CF_Playback_t pb; os_dirent_t dirent[3]; @@ -1318,8 +1318,8 @@ void Test_CF_CFDP_ResetTransaction(void) */ CF_Transaction_t *t; - CF_History_t *h; - CF_Channel_t *c; + CF_History_t * h; + CF_Channel_t * c; CF_Playback_t pb; memset(&pb, 0, sizeof(pb)); diff --git a/unit-test/cf_chunk_tests.c b/unit-test/cf_chunk_tests.c index 2b318ed1..f6d19845 100644 --- a/unit-test/cf_chunk_tests.c +++ b/unit-test/cf_chunk_tests.c @@ -25,8 +25,8 @@ typedef struct { uint32 count; const CF_ChunkList_t *cs; - const CF_Chunk_t *c; - void *opaque; + const CF_Chunk_t * c; + void * opaque; } Dummy_compute_gap_fn_t_context_t; Dummy_compute_gap_fn_t_context_t context_Dummy_compute_gap_fn_t; @@ -139,7 +139,7 @@ void Test_CF_Chunks_When_start_Is_OneMoreThan_end_MovesOneChunk_EraseRange(void) /* Arrange */ CF_Chunk_t dummy_chunk_array[2]; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_start = 0; CF_ChunkIdx_t arg_end = 1; CF_ChunkOffset_t dummy_start_offset = Any_uint32(); @@ -168,7 +168,7 @@ void Test_CF_Chunks_When_start_IsLessThan_chunks_count_DoesNotChangeStart_EraseR /* Arrange */ CF_Chunk_t dummy_chunk_array[2]; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_start = 2; CF_ChunkIdx_t arg_end = 3; CF_ChunkOffset_t dummy_start_offset = Any_uint32(); @@ -264,7 +264,7 @@ void Test_CF_Chunks_EraseChunk_EraseOneChunkThatIsNotTheLastFrom_chunks_AndDecre Any_uint8_LessThan(10) + 2; /* 2-11, reasonably small count for testing and not its normal uint32 */ CF_Chunk_t dummy_chunk[11] = {{0}}; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_erase_index; uint8 i = 0; CF_ChunkOffset_t offsets[11] = {0}; @@ -327,7 +327,7 @@ void Test_CF_Chunks_EraseChunk_ErasesLastChunkFrom_chunks_AndDecrements_count(vo Any_uint8_LessThan(10) + 2; /* 2-11, reasonably small count for testing and not its normal uint32 */ CF_Chunk_t dummy_chunk[11] = {{0}}; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_erase_index = initial_count - 1; uint8 i = 0; CF_ChunkOffset_t offsets[11] = {0}; @@ -424,7 +424,7 @@ void Test_CF_Chunks_InsertChunk_PutGiven_chunk_IntoEmpty_chunks(void) /* Arrange */ CF_Chunk_t initial_chunks[1]; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_index_before = 0; CF_Chunk_t dummy_chunk = {0}; const CF_Chunk_t *arg_chunk; @@ -456,7 +456,7 @@ void Test_CF_Chunks_InsertChunk_PutGiven_chunk_IntoStartOfSingle_chunks(void) CF_Chunk_t initial_start_chunk; CF_Chunk_t initial_chunks[2] = {{0}}; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_index_before = 0; CF_Chunk_t dummy_chunk = {0}; const CF_Chunk_t *arg_chunk; @@ -496,7 +496,7 @@ void Test_CF_Chunks_InsertChunk_PutGiven_chunk_IntoEndOfSingle_chunks(void) CF_Chunk_t initial_start_chunk; CF_Chunk_t initial_chunks[2] = {{0}}; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_index_before = 1; CF_Chunk_t dummy_chunk = {0}; const CF_Chunk_t *arg_chunk; @@ -537,7 +537,7 @@ void Test_CF_Chunks_InsertChunk_PutGiven_chunk_IntoSome_chunks(void) Any_uint8_LessThan(10) + 1; /* 1-10, reasonably small count for testing and not its normal uint32 */ CF_Chunk_t initial_chunks[11] = {{0}}; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_index_before = 0; CF_Chunk_t dummy_chunk = {0}; const CF_Chunk_t *arg_chunk; @@ -603,7 +603,7 @@ void Test_CF_Chunks_FindInsertPosition_Given_chunks_IsEmptyReturn_0(void) CF_ChunkList_t dummy_chunks; CF_ChunkList_t *arg_chunks = &dummy_chunks; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; CF_ChunkIdx_t local_result; arg_chunks->count = 0; @@ -622,7 +622,7 @@ void Test_CF_Chunks_FindInsertPosition_Given_chunks_HasOneItemAndGiven_chunk_off CF_ChunkList_t dummy_chunks; CF_ChunkList_t *arg_chunks = &dummy_chunks; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; CF_ChunkIdx_t local_result; initial_chunks[0].offset = Any_uint32_Except(0); @@ -646,7 +646,7 @@ void Test_CF_Chunks_FindInsertPosition_Given_chunks_HasOneItemAndGiven_chunk_off CF_ChunkList_t dummy_chunks; CF_ChunkList_t *arg_chunks = &dummy_chunks; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; CF_ChunkIdx_t local_result; initial_chunks[0].offset = Any_uint32_Except(0); @@ -670,7 +670,7 @@ void Test_CF_Chunks_FindInsertPosition_Given_chunks_HasOneItemAndGiven_chunk_off CF_ChunkList_t dummy_chunks; CF_ChunkList_t *arg_chunks = &dummy_chunks; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; CF_ChunkIdx_t local_result; initial_chunks[0].offset = Any_uint32_Except(UINT32_MAX); @@ -695,7 +695,7 @@ void Test_CF_Chunks_FindInsertPosition_Given_chunks_HasTwoItemsAndGiven_chunk_of CF_ChunkList_t dummy_chunks; CF_ChunkList_t *arg_chunks = &dummy_chunks; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; CF_ChunkIdx_t local_result; initial_chunks[0].offset = Any_uint32_BetweenExcludeMax(0, UINT32_MAX - 1); @@ -722,7 +722,7 @@ void Test_CF_Chunks_FindInsertPosition_Given_chunks_HasAnyItemsAndReturnCorrectE CF_ChunkList_t dummy_chunks; CF_ChunkList_t *arg_chunks = &dummy_chunks; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; CF_ChunkIdx_t local_result; uint8 num_chunks_before = Any_uint8_LessThan(10); uint8 num_chunks_after = Any_uint8_LessThan(10); @@ -806,7 +806,7 @@ void Test_CF_Chunks_CombinePrevious_Given_i_Is_0_Return_0(void) CF_ChunkList_t *arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_i; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; int local_result = Any_int_Except(0); arg_chunks->max_chunks = Any_uint32_Except(0); @@ -827,7 +827,7 @@ void Test_CF_Chunks_CombinePrevious_Given_chunks_count_Is_0_Return_0(void) CF_ChunkList_t *arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_i; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; int local_result = Any_int_Except(0); arg_chunks->max_chunks = Any_uint32_Except(0); @@ -848,7 +848,7 @@ void Test_CF_Chunks_CombinePrevious_Given_i_Is_0_And_chunks_count_Is_0_Return_0( CF_ChunkList_t *arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_i; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; int local_result = Any_int_Except(0); arg_chunks->max_chunks = Any_uint32_Except(0); @@ -874,7 +874,7 @@ void Test_CF_Chunks_CombinePrevious_GivenIndexMinusOne_chunks_chunks_ValueFor_pr Any_uint32_LessThan(dummy_chunks_count) + 1; /* arg_i gets +1 because the index is 0 based, but the CUT expects an i of min 1 which is the 0 element */ CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; CF_ChunkOffset_t dummy_offset = Any_uint32_LessThan(UINT32_MAX / 2); CF_ChunkSize_t dummy_size = Any_uint32_LessThan(UINT32_MAX / 2); int local_result = Any_int_Except(0); @@ -908,7 +908,7 @@ void Test_CF_Chunks_CombinePrevious_GivenIndexMinusOne_chunks_chunks_ValueFor_pr Any_uint32_LessThan(dummy_chunks_count) + 1; /* arg_i gets +1 because the index is 0 based, but the CUT expects an i of min 1 which is the 0 element */ CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; CF_ChunkOffset_t dummy_offset = Any_uint32_LessThan(UINT32_MAX / 2); CF_ChunkSize_t dummy_size = Any_uint32_LessThan(UINT32_MAX / 2); int local_result = Any_int_Except(0); @@ -943,7 +943,7 @@ void Test_CF_Chunks_CombinePrevious_GivenIndexMinusOne_chunks_chunks_ValueFor_pr Any_uint32_LessThan(dummy_chunks_count) + 1; /* arg_i gets +1 because the index is 0 based, but the CUT expects an i of min 1 which is the 0 element */ CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; CF_ChunkOffset_t dummy_offset = Any_uint32_LessThan(UINT32_MAX / 2); CF_ChunkSize_t dummy_size = Any_uint32_LessThan(UINT32_MAX / 2); int local_result = Any_int_Except(0); @@ -978,7 +978,7 @@ void Test_CF_Chunks_CombinePrevious_GivenIndexMinusOne_chunks_chunks_ValueFor_pr Any_uint32_LessThan(dummy_chunks_count) + 1; /* arg_i gets +1 because the index is 0 based, but the CUT expects an i of min 1 which is the 0 element */ CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; CF_ChunkOffset_t dummy_offset = Any_uint32_LessThan(UINT32_MAX / 2); CF_ChunkSize_t dummy_size = Any_uint32_LessThan(UINT32_MAX / 2); int local_result = Any_int_Except(0); @@ -1013,7 +1013,7 @@ void Test_CF_Chunks_CombinePrevious_GivenIndexMinusOne_chunks_chunks_ValueFor_pr Any_uint32_LessThan(dummy_chunks_count) + 1; /* arg_i gets +1 because the index is 0 based, but the CUT expects an i of min 1 which is the 0 element */ CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; CF_ChunkOffset_t dummy_offset = Any_uint32_LessThan(UINT32_MAX / 2); CF_ChunkSize_t initial_size = Any_uint32_LessThan(UINT32_MAX / 2); int local_result = Any_int_Except(0); @@ -1053,7 +1053,7 @@ void Test_CF_Chunks_CombineNext_Given_i_IsEqTo_Given_chunks_count_Return_0(void) CF_ChunkList_t *arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_i; CF_Chunk_t dummy_chunk; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; int local_result = Any_int_Except(0); arg_chunks->count = Any_uint32(); @@ -1100,7 +1100,7 @@ void Test_CF_Chunks_CombineNext_Given_i_IsNotEqTo_Given_chunks_count_Given_chunk CF_ChunkList_t *arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_i; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; int local_result = Any_int_Except(0); arg_chunks->count = dummy_chunks_count; @@ -1131,7 +1131,7 @@ void Test_CF_Chunks_CombineNext_Given_chunks_chunks_offset_IsLessThan_chunk_end_ CF_ChunkList_t *arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_i; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; int local_result = Any_int_Except(0); arg_chunks->count = dummy_chunks_count; @@ -1164,7 +1164,7 @@ void Test_CF_Chunks_CombineNext_Given_i_IsEqToGiven_chunks_count_BreaksBReplaceE CF_ChunkList_t *arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_i; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; uint32 expected_num_chunks_combined; uint8 j = 0; int local_result = Any_int_Except(0); @@ -1207,7 +1207,7 @@ void Test_CF_Chunks_CombineNext_Given_i_IsEqToGiven_chunks_count_ReplaceEverythi CF_ChunkList_t *arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_i; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; int local_result = Any_int_Except(0); arg_chunks->count = dummy_chunks_count; @@ -1364,7 +1364,7 @@ void Test_CF_Chunks_Insert_CallTo_CF_Chunks_CombineNext_Returns_non0_CallTo_CF_C CF_ChunkIdx_t initial_i; CF_ChunkIdx_t arg_i; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; /* Arrange for CF_Chunks_CombineNext to return 1 */ /* Arrange for CF_Chunks_CombinePrevious to return 0 */ @@ -1401,7 +1401,7 @@ void Test_CF_Chunks_Insert_CombinesNextSuccessButCombinePreviousSuccessCalls_CF_ CF_ChunkList_t *arg_chunks; CF_ChunkIdx_t arg_i; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; /* Arrange for CF_Chunks_CombineNext to return 1 */ /* Arrange for CF_Chunks_CombinePrevious to return 1 */ @@ -1437,7 +1437,7 @@ void Test_CF_Chunks_Insert_CallTo_CF_Chunks_CombineNext_Returns_0_CallTo_CF_Chun CF_ChunkList_t *arg_chunks; CF_ChunkIdx_t arg_i; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; /* Arrange for CF_Chunks_CombineNext to return 0 and CF_Chunks_CombinePrevious to return 1 */ uint8 dummy_chunks_count = 10; /* 10 for dummy_chunks_count is arbitrary, chosen for speed */ @@ -1475,7 +1475,7 @@ void Test_CF_Chunks_Insert_CallTo_CF_Chunks_CombineNext_Returns_0_CallTo_CF_Chun CF_ChunkList_t *arg_chunks; CF_ChunkIdx_t arg_i; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; /* Arrange for CF_Chunks_CombineNext to return 0 and CF_Chunks_CombinePrevious to return 0 */ CF_ChunkIdx_t dummy_chunks_count; @@ -1483,8 +1483,8 @@ void Test_CF_Chunks_Insert_CallTo_CF_Chunks_CombineNext_Returns_0_CallTo_CF_Chun CF_ChunkList_t dummy_chunks; arg_chunks = &dummy_chunks; - arg_chunks->max_chunks = sizeof(dummy_chunks_chunks)/sizeof(dummy_chunks_chunks[0]); - dummy_chunks_count = arg_chunks->max_chunks - 1; /* Arbitrary, but selecting last slot */ + arg_chunks->max_chunks = sizeof(dummy_chunks_chunks) / sizeof(dummy_chunks_chunks[0]); + dummy_chunks_count = arg_chunks->max_chunks - 1; /* Arbitrary, but selecting last slot */ arg_chunks->count = dummy_chunks_count; arg_i = arg_chunks->count; @@ -1514,7 +1514,7 @@ void Test_CF_Chunks_Insert_CallTo_CF_Chunks_CombineNext_Returns_0_CallTo_CF_Chun CF_ChunkList_t *arg_chunks; CF_ChunkIdx_t arg_i; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; /* Arrange for CF_Chunks_CombineNext to return 0 and CF_Chunks_CombinePrevious to return 0 */ CF_ChunkIdx_t dummy_chunks_count = 3; /* 10 for dummy_chunks_count is arbitrary, chosen for speed */ @@ -1556,7 +1556,7 @@ void Test_CF_Chunks_Insert_CallTo_CF_Chunks_CombineNext_Returns_0_CallTo_CF_Chun CF_ChunkList_t *arg_chunks; CF_ChunkIdx_t arg_i; CF_Chunk_t dummy_chunk = {0}; - CF_Chunk_t *arg_chunk = &dummy_chunk; + CF_Chunk_t * arg_chunk = &dummy_chunk; /* Arrange for CF_Chunks_CombineNext to return 0 and CF_Chunks_CombinePrevious to return 0 */ CF_ChunkIdx_t dummy_chunks_count = 3; /* 10 for dummy_chunks_count is arbitrary, chosen for speed */ @@ -1704,7 +1704,7 @@ void Test_CF_Chunks_Add_WhenNotAtEndCall_CF_Chunks_Insert(void) initial_chunks[i + num_chunks_before].offset = Any_uint32_GreaterThan(dummy_chunk.offset); } - arg_chunks->max_chunks = sizeof(initial_chunks)/sizeof(initial_chunks[0]); + arg_chunks->max_chunks = sizeof(initial_chunks) / sizeof(initial_chunks[0]); arg_chunks->count = num_chunks_before + num_chunks_after; arg_chunks->chunks = initial_chunks; @@ -1725,7 +1725,7 @@ void Test_CF_Chunks_Add_WhenAtEndCall_CF_Chunks_Insert(void) CF_ChunkSize_t arg_size = 5; CF_Chunk_t initial_chunks[2] = {{0}}; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; /* Arrange for CF_Chunks_FindInsertPosition */ @@ -1733,7 +1733,7 @@ void Test_CF_Chunks_Add_WhenAtEndCall_CF_Chunks_Insert(void) initial_chunks->size = 0; arg_chunks->count = 1; arg_chunks->chunks = initial_chunks; - arg_chunks->max_chunks = sizeof(initial_chunks)/sizeof(initial_chunks[0]); + arg_chunks->max_chunks = sizeof(initial_chunks) / sizeof(initial_chunks[0]); /* Act */ CF_ChunkListAdd(arg_chunks, arg_offset, arg_size); @@ -1758,7 +1758,7 @@ void Test_CF_Chunks_RemoveFromFirst_When_chunks_HasOnlyOneChunkAndIts_size_IsEqT { /* Arrange */ CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkOffset_t initial_chunks_chunks_offset = Any_uint32(); CF_ChunkSize_t arg_size = Any_uint32_Except(0); CF_Chunk_t dummy_chunks_chunks; @@ -1784,7 +1784,7 @@ void Test_CF_Chunks_RemoveFromFirst_When_chunks_HasOnlyOneChunkAndIts_size_IsSma { /* Arrange */ CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkOffset_t initial_chunks_chunks_offset = Any_uint32(); CF_ChunkSize_t arg_size = Any_uint32_Except(UINT32_MAX - 1) + 2; /* from 2 to UINT_32_MAX */ CF_ChunkSize_t dummy_chunk_size = Any_uint32_LessThan(arg_size); @@ -1812,7 +1812,7 @@ void Test_CF_Chunks_RemoveFromFirst_When_chunks_size_IsGreaterThanGiven_size_Add { /* Arrange */ CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkOffset_t initial_chunks_chunks_offset = Any_uint32(); CF_ChunkSize_t arg_size = Any_uint32_Except(0); /* from 2 to UINT_32_MAX */ CF_ChunkSize_t dummy_chunk_size = Any_uint32_GreaterThan(arg_size); @@ -1846,7 +1846,7 @@ void Test_CF_Chunks_GetFirstChunk_WhenGiven_chunks_count_Is_0_Return_NULL(void) { /* Arrange */ CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; const CF_Chunk_t *local_result; arg_chunks->count = 0; @@ -1862,7 +1862,7 @@ void Test_CF_Chunks_GetFirstChunk_WhenGiven_chunks_count_Is_1_ReturnOnlyChunk(vo { /* Arrange */ CF_ChunkList_t dummy_chunks = {0}; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_Chunk_t only_chunk; const CF_Chunk_t *local_result; @@ -1881,7 +1881,7 @@ void Test_CF_Chunks_GetFirstChunk_WhenGiven_chunks_count_Is_Any_index_t_ReturnFi { /* Arrange */ CF_ChunkList_t dummy_chunks = {0}; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_Chunk_t first_chunk; const CF_Chunk_t *local_result; @@ -2044,12 +2044,12 @@ void Test_CF_Chunks_ComputeGaps_Given_chunks_count_Is_0_And_compute_gap_fn_Is_NU { /* Arrange */ CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_max_gaps = Any_uint32(); CF_ChunkSize_t arg_total = Any_uint32_Except(UINT32_MAX) + 1; /* from 1 to UINT32_MAX */ CF_ChunkOffset_t arg_start = arg_total - 1; CF_ChunkList_ComputeGapFn_t arg_compute_gap_fn = NULL; - void *arg_opaque = NULL; + void * arg_opaque = NULL; int32 result; arg_chunks->count = 0; @@ -2068,12 +2068,12 @@ void Test_CF_Chunks_ComputeGaps_Given_chunks_count_Is_0_And_compute_gap_fn_Is_NU { /* Arrange */ CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_max_gaps = Any_uint32(); CF_ChunkSize_t arg_total = Any_uint32_Except(UINT32_MAX) + 1; /* from 1 to UINT32_MAX */ CF_ChunkOffset_t arg_start = Any_uint32_LessThan(arg_total); CF_ChunkList_ComputeGapFn_t arg_compute_gap_fn = NULL; - void *arg_opaque = NULL; + void * arg_opaque = NULL; int32 result; arg_chunks->count = 0; @@ -2091,12 +2091,12 @@ void Test_CF_Chunks_ComputeGaps_Given_chunks_count_Is_0_And_compute_gap_fn_IsNot { /* Arrange */ CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_max_gaps = Any_uint32(); CF_ChunkSize_t arg_total = Any_uint32_Except(UINT32_MAX) + 1; /* from 1 to UINT32_MAX */ CF_ChunkOffset_t arg_start = Any_uint32_LessThan(arg_total); CF_ChunkList_ComputeGapFn_t arg_compute_gap_fn = Dummy_compute_gap_fn_t; - void *arg_opaque = NULL; + void * arg_opaque = NULL; int32 result; arg_chunks->count = 0; @@ -2124,12 +2124,12 @@ void Test_CF_Chunks_ComputeGaps_Given_max_gaps_Is_0_Return_0(void) /* Arrange */ CF_Chunk_t dummy_chunks_chunks[1] = {{0}}; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_max_gaps = 0; CF_ChunkSize_t arg_total = Any_uint32_Except(UINT32_MAX) + 1; /* from 1 to UINT32_MAX */ CF_ChunkOffset_t arg_start = Any_uint32_LessThan(arg_total); CF_ChunkList_ComputeGapFn_t arg_compute_gap_fn = Dummy_compute_gap_fn_t; - void *arg_opaque = NULL; + void * arg_opaque = NULL; int32 result; arg_chunks->count = 1; @@ -2151,12 +2151,12 @@ void Test_CF_Chunks_ComputeGaps_Given_chunks_count_Is_1_And_gap_start_IsEqTo_tot /* Arrange */ CF_Chunk_t dummy_chunks_chunks[1] = {{0}}; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_max_gaps = Any_uint32(); CF_ChunkSize_t arg_total = Any_uint32_Except(UINT32_MAX) + 1; /* from 1 to UINT32_MAX */ CF_ChunkOffset_t arg_start = Any_uint32_LessThan(arg_total); CF_ChunkList_ComputeGapFn_t arg_compute_gap_fn = Dummy_compute_gap_fn_t; - void *arg_opaque = NULL; + void * arg_opaque = NULL; int32 result; arg_chunks->count = 1; @@ -2178,12 +2178,12 @@ void Test_CF_Chunks_ComputeGaps_Given_chunks_count_Is_1_And_gap_start_IsGreaterT /* Arrange */ CF_Chunk_t dummy_chunks_chunks[1] = {{0}}; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_max_gaps = Any_uint32(); CF_ChunkSize_t arg_total = Any_uint32_Except(UINT32_MAX) + 1; /* from 1 to UINT32_MAX */ CF_ChunkOffset_t arg_start = Any_uint32_LessThan(arg_total); CF_ChunkList_ComputeGapFn_t arg_compute_gap_fn = Dummy_compute_gap_fn_t; - void *arg_opaque = NULL; + void * arg_opaque = NULL; CF_ChunkOffset_t dummy_gap_start = Any_uint32_GreaterThan(arg_total); int32 result; @@ -2206,12 +2206,12 @@ void Test_CF_Chunks_ComputeGaps_Given_chunks_count_Is_1_And_gap_start_IsLessThan /* Arrange */ CF_Chunk_t dummy_chunks_chunks[1] = {{0}}; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_max_gaps = UINT32_MAX; /* UINT32_MAX used to show this will not come into play for this test */ CF_ChunkSize_t arg_total; CF_ChunkOffset_t arg_start = 0; CF_ChunkList_ComputeGapFn_t arg_compute_gap_fn = Dummy_compute_gap_fn_t; - void *arg_opaque = NULL; + void * arg_opaque = NULL; int32 result; arg_chunks->count = 1; @@ -2240,12 +2240,12 @@ void Test_CF_Chunks_ComputeGaps_Given_chunks_count_Is_1_And_c_offset_Plus_c_size /* Arrange */ CF_Chunk_t dummy_chunks_chunks[1] = {{0}}; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_max_gaps = UINT32_MAX; /* UINT32_MAX used to show this will not come into play for this test */ CF_ChunkSize_t arg_total; CF_ChunkOffset_t arg_start; CF_ChunkList_ComputeGapFn_t arg_compute_gap_fn = Dummy_compute_gap_fn_t; - void *arg_opaque = NULL; + void * arg_opaque = NULL; int32 result; arg_chunks->count = 1; @@ -2276,12 +2276,12 @@ void Test_CF_Chunks_ComputeGaps_Given_chunks_count_Is_1_And_c_offset_Plus_c_size /* Arrange */ CF_Chunk_t dummy_chunks_chunks[2] = {{0}}; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_max_gaps = UINT32_MAX; /* UINT32_MAX used to show this will not come into play for this test */ CF_ChunkSize_t arg_total; CF_ChunkOffset_t arg_start; CF_ChunkList_ComputeGapFn_t arg_compute_gap_fn = NULL; - void *arg_opaque = NULL; + void * arg_opaque = NULL; int32 result; arg_chunks->count = 2; @@ -2313,12 +2313,12 @@ void Test_CF_Chunks_ComputeGaps_Given_chunks_count_Is_1_And_c_offset_Plus_c_size /* Arrange */ CF_Chunk_t dummy_chunks_chunks[3] = {{0}}; CF_ChunkList_t dummy_chunks; - CF_ChunkList_t *arg_chunks = &dummy_chunks; + CF_ChunkList_t * arg_chunks = &dummy_chunks; CF_ChunkIdx_t arg_max_gaps = UINT32_MAX; /* UINT32_MAX used to show this will not come into play for this test */ CF_ChunkSize_t arg_total; CF_ChunkOffset_t arg_start; CF_ChunkList_ComputeGapFn_t arg_compute_gap_fn = NULL; - void *arg_opaque = NULL; + void * arg_opaque = NULL; int32 result; arg_chunks->count = 3; diff --git a/unit-test/cf_clist_tests.c b/unit-test/cf_clist_tests.c index a66dbd0a..53bb939b 100644 --- a/unit-test/cf_clist_tests.c +++ b/unit-test/cf_clist_tests.c @@ -30,13 +30,13 @@ typedef struct { CF_CListNode_t *node; - void *context; + void * context; } Dummy_clist_fn_t_context_t; typedef struct { CF_CListNode_t *node; - void *context; + void * context; } Hook_clist_fn_t_context_t; int Dummy_clist_fn_t(CF_CListNode_t *node, void *context) @@ -145,10 +145,10 @@ void Test_CF_CList_InsertFront_AssertsBecauseNodePrevDoesNotPointToItself(void) void Test_CF_CList_InsertFront_InsertNodeIntoEmptyList(void) { /* Arrange */ - CF_CListNode_t *dummy_head = NULL; + CF_CListNode_t * dummy_head = NULL; CF_CListNode_t **arg_head = &dummy_head; CF_CListNode_t dummy_node; - CF_CListNode_t *arg_node = &dummy_node; + CF_CListNode_t * arg_node = &dummy_node; arg_node->next = &dummy_node; arg_node->prev = &dummy_node; @@ -164,10 +164,10 @@ void Test_CF_CList_InsertFront_WhenHeadIsOnlyNodeAndTheyPointToEachOtherInsertNo { /* Arrange */ CF_CListNode_t dummy_head_node; - CF_CListNode_t *dummy_head = &dummy_head_node; + CF_CListNode_t * dummy_head = &dummy_head_node; CF_CListNode_t **arg_head = &dummy_head; CF_CListNode_t dummy_node; - CF_CListNode_t *arg_node = &dummy_node; + CF_CListNode_t * arg_node = &dummy_node; (*arg_head)->next = dummy_head; (*arg_head)->prev = dummy_head; @@ -191,10 +191,10 @@ void Test_CF_CList_InsertFront_WhenHeadIsOneOfTwoNodesAndTheyPointToCorrectNodes { /* Arrange */ CF_CListNode_t dummy_head_node; - CF_CListNode_t *dummy_head = &dummy_head_node; + CF_CListNode_t * dummy_head = &dummy_head_node; CF_CListNode_t **arg_head = &dummy_head; CF_CListNode_t dummy_node; - CF_CListNode_t *arg_node = &dummy_node; + CF_CListNode_t * arg_node = &dummy_node; CF_CListNode_t dummy_last_node; dummy_last_node.next = &dummy_head_node; @@ -224,13 +224,13 @@ void Test_CF_CList_InsertFront_WhenNodeListIsGreaterThanTwoNodesAndTheyPointToCo { /* Arrange */ CF_CListNode_t dummy_head_node; - CF_CListNode_t *dummy_head = &dummy_head_node; + CF_CListNode_t * dummy_head = &dummy_head_node; CF_CListNode_t **arg_head = &dummy_head; CF_CListNode_t dummy_node; - CF_CListNode_t *arg_node = &dummy_node; + CF_CListNode_t * arg_node = &dummy_node; CF_CListNode_t dummy_last_node; - CF_CListNode_t *dummy_second_node; - CF_CListNode_t *dummy_next_to_last_node; + CF_CListNode_t * dummy_second_node; + CF_CListNode_t * dummy_next_to_last_node; uint8 num_extraneous_nodes = Any_uint8_LessThan(18) + 1; // 1 to 18 int i = 0; @@ -332,10 +332,10 @@ void Test_CF_CList_InsertBack_AssertsBecauseNodePrevDoesNotPointToItself(void) void Test_CF_CList_InsertBack_InsertNodeIntoEmptyList(void) { /* Arrange */ - CF_CListNode_t *dummy_head = NULL; + CF_CListNode_t * dummy_head = NULL; CF_CListNode_t **arg_head = &dummy_head; CF_CListNode_t dummy_node; - CF_CListNode_t *arg_node = &dummy_node; + CF_CListNode_t * arg_node = &dummy_node; arg_node->next = &dummy_node; arg_node->prev = &dummy_node; @@ -351,10 +351,10 @@ void Test_CF_CList_InsertBack_WhenHeadIsOnlyNodeAndTheyPointToEachOtherInsertNod { /* Arrange */ CF_CListNode_t dummy_head_node; - CF_CListNode_t *dummy_head = &dummy_head_node; + CF_CListNode_t * dummy_head = &dummy_head_node; CF_CListNode_t **arg_head = &dummy_head; CF_CListNode_t dummy_node; - CF_CListNode_t *arg_node = &dummy_node; + CF_CListNode_t * arg_node = &dummy_node; (*arg_head)->next = dummy_head; (*arg_head)->prev = dummy_head; @@ -378,10 +378,10 @@ void Test_CF_CList_InsertBack_WhenHeadIsOneOfTwoNodesAndTheyPointToCorrectNodesI { /* Arrange */ CF_CListNode_t dummy_head_node; - CF_CListNode_t *dummy_head = &dummy_head_node; + CF_CListNode_t * dummy_head = &dummy_head_node; CF_CListNode_t **arg_head = &dummy_head; CF_CListNode_t dummy_node; - CF_CListNode_t *arg_node = &dummy_node; + CF_CListNode_t * arg_node = &dummy_node; CF_CListNode_t dummy_last_node; dummy_last_node.next = &dummy_head_node; @@ -411,13 +411,13 @@ void Test_CF_CList_InsertBack_WhenNodeListIsGreaterThanTwoNodesAndTheyPointToCor { /* Arrange */ CF_CListNode_t dummy_head_node; - CF_CListNode_t *dummy_head = &dummy_head_node; + CF_CListNode_t * dummy_head = &dummy_head_node; CF_CListNode_t **arg_head = &dummy_head; CF_CListNode_t dummy_node; - CF_CListNode_t *arg_node = &dummy_node; + CF_CListNode_t * arg_node = &dummy_node; CF_CListNode_t dummy_last_node; - CF_CListNode_t *dummy_second_node; - CF_CListNode_t *dummy_next_to_last_node; + CF_CListNode_t * dummy_second_node; + CF_CListNode_t * dummy_next_to_last_node; uint8 num_extraneous_nodes = Any_uint8_LessThan(18) + 1; // 1 to 18 int i = 0; @@ -494,9 +494,9 @@ void Test_CF_CList_Pop_AssertsBecause_head_Is_NULL(void) void Test_CF_CList_Pop_WhenListIsEmptySuccessReturn_NULL(void) { /* Arrange */ - CF_CListNode_t *dummy_head = NULL; + CF_CListNode_t * dummy_head = NULL; CF_CListNode_t **arg_head = &dummy_head; - CF_CListNode_t *local_result; + CF_CListNode_t * local_result; /* Act */ local_result = CF_CList_Pop(arg_head); @@ -509,9 +509,9 @@ void Test_CF_CList_Pop_WhenItIsOnlyNodePopHeadNodeAndReturn_head_(void) { /* Arrange */ CF_CListNode_t dummy_head_node; - CF_CListNode_t *dummy_head = &dummy_head_node; + CF_CListNode_t * dummy_head = &dummy_head_node; CF_CListNode_t **arg_head = &dummy_head; - CF_CListNode_t *local_result; + CF_CListNode_t * local_result; /* Arrange unstubbable: CF_CList_Remove */ dummy_head->prev = dummy_head; @@ -528,14 +528,14 @@ void Test_CF_CList_Pop_WhenListIsAnySizeGreaterThanOneSuccessPopsHeadNodeAndRetu { /* Arrange */ CF_CListNode_t dummy_head_node; - CF_CListNode_t *dummy_head = &dummy_head_node; + CF_CListNode_t * dummy_head = &dummy_head_node; CF_CListNode_t **arg_head = &dummy_head; CF_CListNode_t dummy_last_node; - CF_CListNode_t *dummy_second_node = &dummy_last_node; - CF_CListNode_t *dummy_next_to_last_node = dummy_head; + CF_CListNode_t * dummy_second_node = &dummy_last_node; + CF_CListNode_t * dummy_next_to_last_node = dummy_head; uint8 num_extraneous_nodes = Any_uint8_LessThan(19); // 0 to 18 int i = 0; - CF_CListNode_t *local_result; + CF_CListNode_t * local_result; /* Arrange unstubbable: CF_CList_Remove */ for (i = 0; i < num_extraneous_nodes; ++i) @@ -631,7 +631,7 @@ void Test_CF_ClistRemove_WhenOnlyNodeSetHeadTo_NULL(void) { /* Arrange */ CF_CListNode_t dummy_node; - CF_CListNode_t *arg_node = &dummy_node; + CF_CListNode_t * arg_node = &dummy_node; CF_CListNode_t **arg_head = &arg_node; arg_node->prev = arg_node; @@ -651,10 +651,10 @@ void Test_CF_ClistRemove_WhenOnlyTwoNodesAndLastIsRemovedSetHeadToPointToItself( { /* Arrange */ CF_CListNode_t dummy_head_node; - CF_CListNode_t *dummy_head = &dummy_head_node; + CF_CListNode_t * dummy_head = &dummy_head_node; CF_CListNode_t **arg_head = &dummy_head; CF_CListNode_t dummy_arg_node; - CF_CListNode_t *arg_node = &dummy_arg_node; + CF_CListNode_t * arg_node = &dummy_arg_node; dummy_head_node.prev = arg_node; dummy_head_node.next = arg_node; @@ -678,12 +678,12 @@ void Test_CF_ClistRemove_RemovingHeadSetSecondNodeToHeadAndUpdateLastNode(void) { /* Arrange */ CF_CListNode_t dummy_head_node; - CF_CListNode_t *dummy_head = &dummy_head_node; + CF_CListNode_t * dummy_head = &dummy_head_node; CF_CListNode_t **arg_head = &dummy_head; - CF_CListNode_t *arg_node = *arg_head; + CF_CListNode_t * arg_node = *arg_head; CF_CListNode_t dummy_last_node; - CF_CListNode_t *dummy_second_node; - CF_CListNode_t *dummy_next_to_last_node; + CF_CListNode_t * dummy_second_node; + CF_CListNode_t * dummy_next_to_last_node; uint8 num_extraneous_nodes = Any_uint8_LessThan(18) + 1; // 1 to 18 int i = 0; @@ -743,12 +743,12 @@ void Test_CF_ClistRemove_RemovingLastPointHeadAndNextToLastToEachOther(void) { /* Arrange */ CF_CListNode_t dummy_head_node; - CF_CListNode_t *dummy_head = &dummy_head_node; + CF_CListNode_t * dummy_head = &dummy_head_node; CF_CListNode_t **arg_head = &dummy_head; CF_CListNode_t dummy_last_node; - CF_CListNode_t *arg_node = &dummy_last_node; - CF_CListNode_t *dummy_second_node; - CF_CListNode_t *dummy_next_to_last_node; + CF_CListNode_t * arg_node = &dummy_last_node; + CF_CListNode_t * dummy_second_node; + CF_CListNode_t * dummy_next_to_last_node; uint8 num_extraneous_nodes = Any_uint8_LessThan(18) + 1; // 1 to 18 int i = 0; @@ -807,15 +807,15 @@ void Test_CF_ClistRemove_RemovingAnyNodeHasNodesPrevAndNextPointToEachOther(void { /* Arrange */ CF_CListNode_t dummy_head_node; - CF_CListNode_t *dummy_head = &dummy_head_node; + CF_CListNode_t * dummy_head = &dummy_head_node; CF_CListNode_t **arg_head = &dummy_head; CF_CListNode_t dummy_last_node; - CF_CListNode_t *dummy_removed_node; - CF_CListNode_t *dummy_removed_node_prev; - CF_CListNode_t *dummy_removed_node_next; - CF_CListNode_t *arg_node; - CF_CListNode_t *dummy_second_node; - CF_CListNode_t *dummy_next_to_last_node; + CF_CListNode_t * dummy_removed_node; + CF_CListNode_t * dummy_removed_node_prev; + CF_CListNode_t * dummy_removed_node_next; + CF_CListNode_t * arg_node; + CF_CListNode_t * dummy_second_node; + CF_CListNode_t * dummy_next_to_last_node; uint8 num_extraneous_nodes = Any_uint8_LessThan(18) + 1; // 1 to 18 uint8 num_of_removed_node = Any_uint8_LessThan(num_extraneous_nodes); int i = 0; @@ -990,11 +990,11 @@ void Test_CF_CList_InsertAfter_WhenOnlyOneNodeSuccess_after_IsInsertedAfter_star { /* Arrange */ CF_CListNode_t dummy_head_node; - CF_CListNode_t *dummy_head = &dummy_head_node; + CF_CListNode_t * dummy_head = &dummy_head_node; CF_CListNode_t **arg_head = &dummy_head; - CF_CListNode_t *arg_start = dummy_head; + CF_CListNode_t * arg_start = dummy_head; CF_CListNode_t dummy_after_node; - CF_CListNode_t *arg_after = &dummy_after_node; + CF_CListNode_t * arg_after = &dummy_after_node; dummy_head->prev = dummy_head; dummy_head->next = dummy_head; @@ -1017,15 +1017,15 @@ void Test_CF_CList_InsertAfter_WhenAnyNodeSuccess_after_IsInsertedAfter_start(vo /* Arrange */ /* Arrange */ CF_CListNode_t dummy_head_node; - CF_CListNode_t *dummy_head = &dummy_head_node; + CF_CListNode_t * dummy_head = &dummy_head_node; CF_CListNode_t **arg_head = &dummy_head; CF_CListNode_t dummy_last_node; - CF_CListNode_t *dummy_second_node; - CF_CListNode_t *dummy_next_to_last_node; - CF_CListNode_t *arg_start; + CF_CListNode_t * dummy_second_node; + CF_CListNode_t * dummy_next_to_last_node; + CF_CListNode_t * arg_start; CF_CListNode_t dummy_after; - CF_CListNode_t *arg_after = &dummy_after; - CF_CListNode_t *dummy_after_next; + CF_CListNode_t * arg_after = &dummy_after; + CF_CListNode_t * dummy_after_next; uint8 num_extraneous_nodes = Any_uint8_LessThan(18) + 1; // 1 to 18 uint8 insertion_point = Any_uint8_LessThan(num_extraneous_nodes); int i = 0; @@ -1109,7 +1109,7 @@ void Test_CF_CList_Traverse_When_start_Is_NULL_DoNothing(void) /* Arrange */ CF_CListNode_t *arg_start = NULL; CF_CListFn_t arg_fn = Dummy_clist_fn_t; - void *arg_context = NULL; + void * arg_context = NULL; /* Act */ CF_CList_Traverse(arg_start, arg_fn, arg_context); @@ -1122,10 +1122,10 @@ void Test_CF_CList_Traverse_WhenListIsMoreThanOneNodeErrorOutFirst_fn_CallFails( { /* Arrange */ CF_CListNode_t dummy_start; - CF_CListNode_t *arg_start = &dummy_start; + CF_CListNode_t * arg_start = &dummy_start; CF_CListFn_t arg_fn = Dummy_clist_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; Dummy_clist_fn_t_context_t context_Dummy_clist_fn_t; arg_start->next = NULL; @@ -1146,10 +1146,10 @@ void Test_CF_CList_Traverse_WhenListIsOneNodeSuccess(void) { /* Arrange */ CF_CListNode_t dummy_start; - CF_CListNode_t *arg_start = &dummy_start; + CF_CListNode_t * arg_start = &dummy_start; CF_CListFn_t arg_fn = Dummy_clist_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; Dummy_clist_fn_t_context_t context_Dummy_clist_fn_t; arg_start->next = arg_start; @@ -1172,10 +1172,10 @@ void Test_CF_CList_Traverse_CanActuallyGet_n_next_NotEqTo_nn_ButOnlyWithAn_fn_Th { /* Arrange */ CF_CListNode_t dummy_start; - CF_CListNode_t *arg_start = &dummy_start; + CF_CListNode_t * arg_start = &dummy_start; CF_CListFn_t arg_fn = Hook_clist_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; Hook_clist_fn_t_context_t context_Hook_clist_fn_t; arg_start->next = arg_start; @@ -1195,11 +1195,11 @@ void Test_CF_CList_Traverse_CanActuallyGet_n_next_NotEqTo_nn_ButOnlyWithAn_fn_Th void Test_CF_CList_Traverse_WhenListIsManyNodesErrorIn_fn_Call(void) { /* Arrange */ - CF_CListNode_t *arg_start; - CF_CListNode_t *adder_node; + CF_CListNode_t * arg_start; + CF_CListNode_t * adder_node; CF_CListFn_t arg_fn = Dummy_clist_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; uint8 list_size = Any_uint8_LessThan(9) + 2; /* 2 - 10 */ uint8 error_location = Any_uint8_LessThan(list_size); /* 0 to list_size - 1 */ int i = 0; @@ -1274,11 +1274,11 @@ void Test_CF_CList_Traverse_WhenListIsManyNodesErrorIn_fn_Call(void) void Test_CF_CList_Traverse_WhenListIsManyNodesSuccess(void) { /* Arrange */ - CF_CListNode_t *arg_start; - CF_CListNode_t *adder_node; + CF_CListNode_t * arg_start; + CF_CListNode_t * adder_node; CF_CListFn_t arg_fn = Dummy_clist_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; uint8 list_size = Any_uint8_LessThan(9) + 2; /* 2 - 10 */ int i = 0; Dummy_clist_fn_t_context_t context_Dummy_clist_fn_t[list_size + 1]; @@ -1359,7 +1359,7 @@ void Test_CF_CList_Traverse_R_When_end_Is_NULL_DoNothing(void) /* Arrange */ CF_CListNode_t *arg_end = NULL; CF_CListFn_t arg_fn = NULL; - void *arg_context = NULL; + void * arg_context = NULL; /* Act */ CF_CList_Traverse_R(arg_end, arg_fn, arg_context); @@ -1375,7 +1375,7 @@ void Test_CF_CList_Traverse_R_When_end_prev_Is_NULLDoNothing(void) CF_CListNode_t *arg_end = &dummy_end; CF_CListFn_t arg_fn = Dummy_clist_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; arg_end->prev = NULL; @@ -1390,12 +1390,12 @@ void Test_CF_CList_Traverse_R_WhenListIsMoreThanOneNodeErrorOutFirst_fn_CallFail { /* Arrange */ CF_CListNode_t dummy_end; - CF_CListNode_t *arg_end = &dummy_end; + CF_CListNode_t * arg_end = &dummy_end; CF_CListFn_t arg_fn = Dummy_clist_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; CF_CListNode_t dummy_end_prev_node; - CF_CListNode_t *dummy_end_prev = &dummy_end_prev_node; + CF_CListNode_t * dummy_end_prev = &dummy_end_prev_node; Dummy_clist_fn_t_context_t context_Dummy_clist_fn_t; memset(&dummy_end, 0, sizeof(dummy_end)); @@ -1419,10 +1419,10 @@ void Test_CF_CList_Traverse_R_PassedIn_end_IsTheOnlyNode_fn_Returned_non0(void) { /* Arrange */ CF_CListNode_t dummy_end; - CF_CListNode_t *arg_end = &dummy_end; + CF_CListNode_t * arg_end = &dummy_end; CF_CListFn_t arg_fn = Dummy_clist_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; Dummy_clist_fn_t_context_t context_Dummy_clist_fn_t; arg_end->prev = arg_end; @@ -1444,10 +1444,10 @@ void Test_CF_CList_Traverse_R_PassedIn_end_IsNotTheOnlyNode_fn_Returned_non0_Ori /* Arrange */ CF_CListNode_t dummy_node; CF_CListNode_t dummy_end; - CF_CListNode_t *arg_end = &dummy_end; + CF_CListNode_t * arg_end = &dummy_end; CF_CListFn_t arg_fn = Dummy_clist_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; Dummy_clist_fn_t_context_t context_Dummy_clist_fn_t[2]; arg_end->prev = &dummy_node; @@ -1473,10 +1473,10 @@ void Test_CF_CList_Traverse_R_CanActuallyGet_n_next_NotEqTo_nn_ButOnlyWithAn_fn_ { /* Arrange */ CF_CListNode_t dummy_end; - CF_CListNode_t *arg_end = &dummy_end; + CF_CListNode_t * arg_end = &dummy_end; CF_CListFn_t arg_fn = Hook_clist_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; Hook_clist_fn_t_context_t context_Hook_clist_fn_t; arg_end->prev = arg_end; diff --git a/unit-test/cf_cmd_tests.c b/unit-test/cf_cmd_tests.c index 81775a4f..a3bc54d7 100644 --- a/unit-test/cf_cmd_tests.c +++ b/unit-test/cf_cmd_tests.c @@ -145,7 +145,7 @@ CF_TransactionSeq_t Any_CF_TransactionSeq_t(void) typedef struct { CF_Transaction_t *t; - void *context; + void * context; } Dummy_CF_TsnChanAction_fn_t_context_t; int Dummy_chan_action_fn_t(uint8 chan_num, void *context) @@ -300,8 +300,8 @@ void Test_CF_CmdReset_tests_WhenCommandByteIsEqTo_5_SendEventAndRejectCommand(vo { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -328,8 +328,8 @@ void Test_CF_CmdReset_tests_WhenCommandByteIsGreaterThan_5_SendEventAndRejectCom { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -356,8 +356,8 @@ void Test_CF_CmdReset_tests_WhenCommandByteIs_command_AndResetHkCmdAndErrCountSe { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -382,8 +382,8 @@ void Test_CF_CmdReset_tests_WhenCommandByteIs_fault_ResetAllHkFaultCountSendEven { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; int i = 0; memset(&utbuf, 0, sizeof(utbuf)); @@ -447,8 +447,8 @@ void Test_CF_CmdReset_tests_WhenCommandByteIs_up_AndResetAllHkRecvCountSendEvent { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; int i = 0; memset(&utbuf, 0, sizeof(utbuf)); @@ -500,8 +500,8 @@ void Test_CF_CmdReset_tests_SWhenCommandByteIs_down_AndResetAllHkSentCountendEve { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; uint8 i = 0; memset(&utbuf, 0, sizeof(utbuf)); @@ -547,8 +547,8 @@ void Test_CF_CmdReset_tests_WhenCommandByteIs_all_AndResetAllMemValuesSendEvent( { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; int i = 0; memset(&utbuf, 0, sizeof(utbuf)); @@ -636,7 +636,7 @@ void Test_CF_CmdTxFile(void) * void CF_CmdTxFile(CFE_SB_Buffer_t *msg); */ CF_UT_cmd_tx_file_buf_t utbuf; - CF_TxFileCmd_t *msg = &utbuf.tf; + CF_TxFileCmd_t * msg = &utbuf.tf; memset(&CF_AppData.hk.counters, 0, sizeof(CF_AppData.hk.counters)); @@ -684,7 +684,7 @@ void Test_CF_CmdPlaybackDir(void) * void CF_CmdPlaybackDir(CFE_SB_Buffer_t *msg); */ CF_UT_cmd_playback_dir_buf_t utbuf; - CF_PlaybackDirCmd_t *msg = &utbuf.pd; + CF_PlaybackDirCmd_t * msg = &utbuf.pd; memset(&CF_AppData.hk.counters, 0, sizeof(CF_AppData.hk.counters)); @@ -730,11 +730,11 @@ void Test_CF_DoChanAction_ALL_CHANNELS_WhenAny_fn_returns_1_Return_1(void) { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *arg_cmd = &utbuf.ua; - const char *arg_errstr = "CANNOT TEST SENT TO SEND EVENT"; + CF_UnionArgsCmd_t * arg_cmd = &utbuf.ua; + const char * arg_errstr = "CANNOT TEST SENT TO SEND EVENT"; CF_ChanActionFn_t arg_fn = &Dummy_chan_action_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; uint8 random_fn_call = Any_uint8_LessThan(CF_NUM_CHANNELS) + 1; int local_result; @@ -761,11 +761,11 @@ void Test_CF_DoChanAction_ALL_CHANNELS_WhenAll_fn_return_1_Return_1(void) { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *arg_cmd = &utbuf.ua; - const char *arg_errstr = "CANNOT TEST SENT TO SEND EVENT"; + CF_UnionArgsCmd_t * arg_cmd = &utbuf.ua; + const char * arg_errstr = "CANNOT TEST SENT TO SEND EVENT"; CF_ChanActionFn_t arg_fn = &Dummy_chan_action_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; int local_result; memset(&utbuf, 0, sizeof(utbuf)); @@ -791,11 +791,11 @@ void Test_CF_DoChanAction_ALL_CHANNELS_WhenNo_fn_returns_0_Return_0(void) { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *arg_cmd = &utbuf.ua; - const char *arg_errstr = "CANNOT TEST SENT TO SEND EVENT"; + CF_UnionArgsCmd_t * arg_cmd = &utbuf.ua; + const char * arg_errstr = "CANNOT TEST SENT TO SEND EVENT"; CF_ChanActionFn_t arg_fn = &Dummy_chan_action_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; int local_result; memset(&utbuf, 0, sizeof(utbuf)); @@ -821,11 +821,11 @@ void Test_CF_DoChanAction_WhenChannel_fn_ActionReturns_1_Return_1(void) { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *arg_cmd = &utbuf.ua; - const char *arg_errstr = "CANNOT TEST SENT TO SEND EVENT"; + CF_UnionArgsCmd_t * arg_cmd = &utbuf.ua; + const char * arg_errstr = "CANNOT TEST SENT TO SEND EVENT"; CF_ChanActionFn_t arg_fn = &Dummy_chan_action_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; int local_result; memset(&utbuf, 0, sizeof(utbuf)); @@ -851,11 +851,11 @@ void Test_CF_DoChanAction_WhenChannel_fn_ActionReturns_0_Return_1(void) { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *arg_cmd = &utbuf.ua; - const char *arg_errstr = "CANNOT TEST SENT TO SEND EVENT"; + CF_UnionArgsCmd_t * arg_cmd = &utbuf.ua; + const char * arg_errstr = "CANNOT TEST SENT TO SEND EVENT"; CF_ChanActionFn_t arg_fn = &Dummy_chan_action_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; int local_result; memset(&utbuf, 0, sizeof(utbuf)); @@ -881,11 +881,11 @@ void Test_CF_DoChanAction_WhenChanNumberEq_CF_NUM_CHANNELS_Return_neg1_And_SendE { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *arg_cmd = &utbuf.ua; - const char *arg_errstr = "CANNOT TEST SENT TO SEND EVENT"; + CF_UnionArgsCmd_t * arg_cmd = &utbuf.ua; + const char * arg_errstr = "CANNOT TEST SENT TO SEND EVENT"; CF_ChanActionFn_t arg_fn = &Dummy_chan_action_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; int local_result; memset(&utbuf, 0, sizeof(utbuf)); @@ -914,11 +914,11 @@ void Test_CF_DoChanAction_WhenBadChannelNumber_Return_neg1_And_SendEvent(void) { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *arg_cmd = &utbuf.ua; - const char *arg_errstr = "CANNOT TEST SENT TO SEND EVENT"; + CF_UnionArgsCmd_t * arg_cmd = &utbuf.ua; + const char * arg_errstr = "CANNOT TEST SENT TO SEND EVENT"; CF_ChanActionFn_t arg_fn = &Dummy_chan_action_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; int local_result; memset(&utbuf, 0, sizeof(utbuf)); @@ -1003,8 +1003,8 @@ void Test_CF_CmdFreeze_Set_frozen_To_1_AndAcceptCommand(void) { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; /* Arrange unstubbable: CF_DoFreezeThaw via CF_DoChanAction */ uint8 dummy_chan_num = Any_cf_channel(); @@ -1043,8 +1043,8 @@ void Test_CF_CmdFThaw_Set_frozen_To_0_AndAcceptCommand(void) { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; /* Arrange unstubbable: CF_DoFreezeThaw via CF_DoChanAction */ uint8 dummy_chan_num = Any_cf_channel(); @@ -1085,8 +1085,8 @@ void Test_CF_FindTransactionBySequenceNumberAllChannels_WhenNoTransactionFoundRe /* Arrange */ CF_TransactionSeq_t arg_ts = Any_CF_TransactionSeq_t(); CF_EntityId_t arg_eid = Any_CF_EntityId_t(); - CF_Transaction_t *local_result; - CF_Transaction_t *expected_result = NULL; + CF_Transaction_t * local_result; + CF_Transaction_t * expected_result = NULL; CF_FindTransactionBySequenceNumber_context_t context_CF_CFDP_FTBSN; @@ -1116,8 +1116,8 @@ void Test_CF_FindTransactionBySequenceNumberAllChannels_Return_TransactionFound( CF_EntityId_t arg_eid = Any_CF_EntityId_t(); uint8 number_transaction_match = Any_uint8_LessThan(CF_NUM_CHANNELS); CF_Transaction_t dummy_return_value; - CF_Transaction_t *local_result; - CF_Transaction_t *expected_result = &dummy_return_value; + CF_Transaction_t * local_result; + CF_Transaction_t * expected_result = &dummy_return_value; CF_FindTransactionBySequenceNumber_context_t contexts_CF_CFDP_FTBSN[CF_NUM_CHANNELS]; @@ -1163,12 +1163,12 @@ void Test_CF_TsnChanAction_SendEvent_cmd_chan_Eq_COMPOUND_KEY_TransactionNotFoun { /* Arrange */ CF_UT_cmd_transaction_buf_t utbuf; - CF_TransactionCmd_t *arg_cmd = &utbuf.xact; + CF_TransactionCmd_t * arg_cmd = &utbuf.xact; char dummy_cmdstr[10]; /* 10 is arbitrary */ const char arg_cmdstr[10]; /* 10 is arbitrary */ CF_TsnChanAction_fn_t arg_fn = &Dummy_CF_TsnChanAction_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; memset(&utbuf, 0, sizeof(utbuf)); AnyRandomStringOfLettersOfLengthCopy(dummy_cmdstr, 10); @@ -1207,12 +1207,12 @@ void Test_CF_TsnChanAction_cmd_chan_Eq_COMPOUND_KEY_TransactionFoundRun_fn_AndRe { /* Arrange */ CF_UT_cmd_transaction_buf_t utbuf; - CF_TransactionCmd_t *arg_cmd = &utbuf.xact; + CF_TransactionCmd_t * arg_cmd = &utbuf.xact; char dummy_cmdstr[10]; /* 10 is arbitrary */ const char arg_cmdstr[10]; /* 10 is arbitrary */ CF_TsnChanAction_fn_t arg_fn = &Dummy_CF_TsnChanAction_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; CF_Transaction_t dummy_t; Dummy_CF_TsnChanAction_fn_t_context_t context_Dummy_CF_TsnChanAction_fn_t; @@ -1251,12 +1251,12 @@ void Test_CF_TsnChanAction_cmd_chan_Eq_ALL_CHANNELS_Return_CF_TraverseAllTransac { /* Arrange */ CF_UT_cmd_transaction_buf_t utbuf; - CF_TransactionCmd_t *arg_cmd = &utbuf.xact; + CF_TransactionCmd_t * arg_cmd = &utbuf.xact; char dummy_cmdstr[10]; /* 10 is arbitrary */ const char arg_cmdstr[10]; /* 10 is arbitrary */ CF_TsnChanAction_fn_t arg_fn = &Dummy_CF_TsnChanAction_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; int expected_result = Any_int(); CF_TraverseAllTransactions_All_Channels_context_t context_CF_TATAC; @@ -1283,11 +1283,11 @@ void Test_CF_TsnChanAction_cmd_chan_IsASingleChannel(void) { /* Arrange */ CF_UT_cmd_transaction_buf_t utbuf; - CF_TransactionCmd_t *arg_cmd = &utbuf.xact; + CF_TransactionCmd_t * arg_cmd = &utbuf.xact; const char arg_cmdstr[1] = ""; CF_TsnChanAction_fn_t arg_fn = &Dummy_CF_TsnChanAction_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; int expected_result = Any_int(); CF_TraverseAllTransactions_context_t context_CF_TraverseAllTransactions; @@ -1311,11 +1311,11 @@ void Test_CF_TsnChanAction_cmd_FailBecause_cmd_chan_IsInvalid(void) { /* Arrange */ CF_UT_cmd_transaction_buf_t utbuf; - CF_TransactionCmd_t *arg_cmd = &utbuf.xact; + CF_TransactionCmd_t * arg_cmd = &utbuf.xact; const char arg_cmdstr[1] = ""; CF_TsnChanAction_fn_t arg_fn = &Dummy_CF_TsnChanAction_fn_t; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; memset(&utbuf, 0, sizeof(utbuf)); arg_cmd->chan = Any_uint8_BetweenExcludeMax(CF_NUM_CHANNELS, COMPOUND_KEY); @@ -1351,7 +1351,7 @@ void Test_CF_DoSuspRes_Txn_Set_context_same_To_1_suspended_Eq_action(void) { /* Arrange */ CF_Transaction_t dummy_t; - CF_Transaction_t *arg_t = &dummy_t; + CF_Transaction_t * arg_t = &dummy_t; CF_ChanAction_SuspResArg_t dummy_context; CF_ChanAction_SuspResArg_t *arg_context = &dummy_context; @@ -1374,7 +1374,7 @@ void Test_CF_DoSuspRes_Txn_When_suspended_NotEqTo_action_Set_suspended_To_action { /* Arrange */ CF_Transaction_t dummy_t; - CF_Transaction_t *arg_t = &dummy_t; + CF_Transaction_t * arg_t = &dummy_t; CF_ChanAction_SuspResArg_t dummy_context; CF_ChanAction_SuspResArg_t *arg_context = &dummy_context; @@ -1421,7 +1421,7 @@ void Test_CF_DoSuspRes(void) */ CF_UT_cmd_transaction_buf_t utbuf; - CF_TransactionCmd_t *cmd = &utbuf.xact; + CF_TransactionCmd_t * cmd = &utbuf.xact; CF_ChanAction_SuspResArg_t utargs; memset(&CF_AppData.hk.counters, 0, sizeof(CF_AppData.hk.counters)); @@ -1472,8 +1472,8 @@ void Test_CF_CmdSuspend_Call_CF_DoSuspRes_WithGiven_msg_And_action_1(void) { /* Arrange */ CF_UT_cmd_transaction_buf_t utbuf; - CF_TransactionCmd_t *dummy_cmd = &utbuf.xact; - CFE_SB_Buffer_t *arg_cmd = &utbuf.buf; + CF_TransactionCmd_t * dummy_cmd = &utbuf.xact; + CFE_SB_Buffer_t * arg_cmd = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -1515,8 +1515,8 @@ void Test_CF_CmdResume_Call_CF_DoSuspRes_WithGiven_msg_And_action_0(void) { /* Arrange */ CF_UT_cmd_transaction_buf_t utbuf; - CF_TransactionCmd_t *dummy_cmd = &utbuf.xact; - CFE_SB_Buffer_t *arg_cmd = &utbuf.buf; + CF_TransactionCmd_t * dummy_cmd = &utbuf.xact; + CFE_SB_Buffer_t * arg_cmd = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -1558,7 +1558,7 @@ void Test_CF_CmdCancel_Txn_Call_CF_CFDP_CancelTransaction_WithGiven_t(void) /* Arrange */ CF_Transaction_t dummy_t; CF_Transaction_t *arg_t = &dummy_t; - void *arg_ignored = NULL; + void * arg_ignored = NULL; CF_Transaction_t *context_CF_CFDP_CancelTransaction; UT_SetDataBuffer(UT_KEY(CF_CFDP_CancelTransaction), &context_CF_CFDP_CancelTransaction, @@ -1582,8 +1582,8 @@ void Test_CF_CmdCancel_Call_CF_CmdCond_WithNotted_CF_TsnChanAction(void) { /* Arrange */ CF_UT_cmd_transaction_buf_t utbuf; - CF_TransactionCmd_t *dummy_msg = &utbuf.xact; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_TransactionCmd_t * dummy_msg = &utbuf.xact; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; // TODO: CF_TsnChanAction result is default with no setup; it should be controlled, but in the essence of time this // default value is used to show functionality of the code @@ -1627,8 +1627,8 @@ void Test_CF_CmdAbandon_Txn_Call_CF_CFDP_ResetTransaction_WithGiven_t_And_0(void { /* Arrange */ CF_Transaction_t dummy_t; - CF_Transaction_t *arg_t = &dummy_t; - void *arg_ignored = NULL; + CF_Transaction_t * arg_t = &dummy_t; + void * arg_ignored = NULL; CF_CFDP_ResetTransaction_context_t context_CF_CFDP_ResetTransaction; UT_SetDataBuffer(UT_KEY(CF_CFDP_ResetTransaction), &context_CF_CFDP_ResetTransaction, @@ -1655,8 +1655,8 @@ void Test_CF_CmdAbandon_Call_CF_CmdCond_WithNotted_CF_TsnChanAction(void) { /* Arrange */ CF_UT_cmd_transaction_buf_t utbuf; - CF_TransactionCmd_t *dummy_msg = &utbuf.xact; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_TransactionCmd_t * dummy_msg = &utbuf.xact; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; // TODO: CF_TsnChanAction result is default with no setup; it should be controlled, but in the essence of time this // default value is used to show functionality of the code @@ -1727,8 +1727,8 @@ void Test_CF_CmdEnableDequeue_Call_CmdCond_WithResultsOf_CF_DoChanAction(void) { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; /* Arrange unstubbable: CF_DoEnableDisableDequeue via CF_DoChanAction */ CF_ConfigTable_t dummy_config_table; @@ -1771,8 +1771,8 @@ void Test_CF_CmdDisableDequeue_Call_CmdCond_WithResultsOf_CF_DoChanAction(void) { /* Arrange */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; /* Arrange unstubbable: CF_DoEnableDisableDequeue via CF_DoChanAction */ CF_ConfigTable_t dummy_config_table; @@ -1815,7 +1815,7 @@ void Test_CF_DoEnableDisablePolldir_When_ALL_CHANNELS_SetAllPolldirsInChannelEna /* Arrange */ uint8 arg_chan_num = Any_cf_channel(); CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; CF_ChanAction_BoolMsgArg_t dummy_context; CF_ChanAction_BoolMsgArg_t *arg_context = &dummy_context; CF_ConfigTable_t dummy_config_table; @@ -1854,7 +1854,7 @@ void Test_CF_DoEnableDisablePolldir_WhenSetToSpecificPolldirSetPolldirFrom_conte uint8 arg_chan_num = Any_cf_channel(); uint8 dummy_polldir = Any_cf_polldir(); CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; CF_ChanAction_BoolMsgArg_t dummy_context; CF_ChanAction_BoolMsgArg_t *arg_context = &dummy_context; CF_ConfigTable_t dummy_config_table; @@ -1887,7 +1887,7 @@ void Test_CF_DoEnableDisablePolldir_FailPolldirEq_CF_MAX_POLLING_DIR_PER_CHAN_An /* Arrange */ uint8 arg_chan_num = Any_cf_channel(); CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; CF_ChanAction_BoolMsgArg_t dummy_context; CF_ChanAction_BoolMsgArg_t *arg_context = &dummy_context; CF_ConfigTable_t dummy_config_table; @@ -1918,7 +1918,7 @@ void Test_CF_DoEnableDisablePolldir_FailAnyBadPolldirSendEvent(void) /* Arrange */ uint8 arg_chan_num = Any_cf_channel(); CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; CF_ChanAction_BoolMsgArg_t dummy_context; CF_ChanAction_BoolMsgArg_t *arg_context = &dummy_context; CF_ConfigTable_t dummy_config_table; @@ -1957,8 +1957,8 @@ void Test_CF_CmdEnablePolldir_SuccessWhenActionSuccess(void) uint8 dummy_channel = Any_cf_channel(); uint8 dummy_polldir = Any_cf_polldir(); CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -1995,8 +1995,8 @@ void Test_CF_CmdEnablePolldir_FailWhenActionFail(void) uint8 dummy_channel = Any_cf_channel(); uint8 error_polldir = Any_uint8_BetweenInclusive(CF_MAX_POLLING_DIR_PER_CHAN, ALL_CHANNELS - 1); CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -2037,8 +2037,8 @@ void Test_CF_CmdDisablePolldir_SuccessWhenActionSuccess(void) uint8 dummy_channel = Any_cf_channel(); uint8 dummy_polldir = Any_cf_polldir(); CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -2075,8 +2075,8 @@ void Test_CF_CmdDisablePolldir_FailWhenActionFail(void) uint8 dummy_channel = Any_cf_channel(); uint8 error_polldir = Any_uint8_BetweenInclusive(CF_MAX_POLLING_DIR_PER_CHAN, ALL_CHANNELS - 1); CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -2112,9 +2112,9 @@ void Test_CF_PurgeHistory_Call_CF_CFDP_ResetHistory_AndReturn_CLIST_CONT(void) { /* Arrange */ CF_History_t dummy_h; - CF_CListNode_t *arg_n = &dummy_h.cl_node; + CF_CListNode_t * arg_n = &dummy_h.cl_node; CF_Channel_t dummy_c; - CF_Channel_t *arg_c = &dummy_c; + CF_Channel_t * arg_c = &dummy_c; int local_result; CF_CFDP_ResetHistory_context_t context_CF_CFDP_ResetHistory; @@ -2142,9 +2142,9 @@ void Test_CF_PurgeTransaction_Call_CF_CFDP_ResetTransaction_AndReturn_CLIST_CONT { /* Arrange */ CF_Transaction_t dummy_t; - CF_CListNode_t *arg_n = &dummy_t.cl_node; + CF_CListNode_t * arg_n = &dummy_t.cl_node; int dummy_ignored; - void *arg_ignored = &dummy_ignored; + void * arg_ignored = &dummy_ignored; int local_result; CF_CFDP_ResetTransaction_context_t context_CF_CFDP_ResetTransaction; @@ -2175,10 +2175,10 @@ void Test_CF_DoPurgeQueue_PendOnly(void) /* Arrange */ uint8 arg_chan_num = Any_cf_channel(); CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *arg_cmd = &utbuf.ua; - CF_Channel_t *dummy_c; + CF_UnionArgsCmd_t * arg_cmd = &utbuf.ua; + CF_Channel_t * dummy_c; CF_CListNode_t dummy_start; - CF_CListNode_t *expected_start = &dummy_start; + CF_CListNode_t * expected_start = &dummy_start; int local_result; CF_CList_Traverse_POINTER_context_t context_CF_CList_Traverse; @@ -2210,10 +2210,10 @@ void Test_CF_DoPurgeQueue_HistoryOnly(void) /* Arrange */ uint8 arg_chan_num = Any_cf_channel(); CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *arg_cmd = &utbuf.ua; - CF_Channel_t *dummy_c; + CF_UnionArgsCmd_t * arg_cmd = &utbuf.ua; + CF_Channel_t * dummy_c; CF_CListNode_t dummy_start; - CF_CListNode_t *expected_start = &dummy_start; + CF_CListNode_t * expected_start = &dummy_start; int local_result; CF_CList_Traverse_POINTER_context_t context_CF_CList_Traverse; @@ -2247,12 +2247,12 @@ void Test_CF_DoPurgeQueue_Both(void) /* Arrange */ uint8 arg_chan_num = Any_cf_channel(); CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *arg_cmd = &utbuf.ua; - CF_Channel_t *dummy_c; + CF_UnionArgsCmd_t * arg_cmd = &utbuf.ua; + CF_Channel_t * dummy_c; CF_CListNode_t dummy_pend_start; - CF_CListNode_t *expected_pend_start = &dummy_pend_start; + CF_CListNode_t * expected_pend_start = &dummy_pend_start; CF_CListNode_t dummy_history_start; - CF_CListNode_t *expected_history_start = &dummy_history_start; + CF_CListNode_t * expected_history_start = &dummy_history_start; int local_result; CF_CList_Traverse_POINTER_context_t context_CF_CList_Traverse[2]; @@ -2292,7 +2292,7 @@ void Test_CF_DoPurgeQueue_GivenBad_data_byte_1_SendEventAndReturn_neg1(void) /* Arrange */ uint8 arg_chan_num = Any_cf_channel(); CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *arg_cmd = &utbuf.ua; + CF_UnionArgsCmd_t * arg_cmd = &utbuf.ua; int local_result; memset(&utbuf, 0, sizeof(utbuf)); @@ -2318,7 +2318,7 @@ void Test_CF_DoPurgeQueue_AnyGivenBad_data_byte_1_SendEventAndReturn_neg1(void) /* Arrange */ uint8 arg_chan_num = Any_cf_channel(); CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *arg_cmd = &utbuf.ua; + CF_UnionArgsCmd_t * arg_cmd = &utbuf.ua; int local_result; memset(&utbuf, 0, sizeof(utbuf)); @@ -2351,8 +2351,8 @@ void Test_CF_CmdPurgeQueue_FailWhenActionFail(void) uint8 dummy_channel = Any_cf_channel(); uint8 error_purge = 3; /* Shortest return from CF_DoPurgeQueue */ CF_UT_cmd_unionargs_buf_t utbuf; - CF_UnionArgsCmd_t *dummy_msg = &utbuf.ua; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_UnionArgsCmd_t * dummy_msg = &utbuf.ua; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -2388,8 +2388,8 @@ void Test_CF_CmdWriteQueue_When_chan_Eq_CF_NUM_CAHNNELS_SendEventAndRejectComman { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -2417,8 +2417,8 @@ void Test_CF_CmdWriteQueue_When_chan_GreaterThan_CF_NUM_CAHNNELS_SendEventAndRej { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -2447,8 +2447,8 @@ void Test_CF_CmdWriteQueue_WhenUpAndPendingQueueSendEventAndRejectCommand(void) { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -2482,8 +2482,8 @@ void Test_CF_CmdWriteQueue_When_CF_WrappedCreat_Fails_type_Is_type_up_And_queue_ { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -2530,8 +2530,8 @@ void Test_CF_CmdWriteQueue_When_CF_WrappedCreat_Fails_type_IsNot_type_up_And_que { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -2578,8 +2578,8 @@ void Test_CF_CmdWriteQueue_When_wq_IsAllAnd_queue_IsAll_fd_Is_0_Call_CF_WrappedC { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -2634,8 +2634,8 @@ void Test_CF_CmdWriteQueue_When_CF_WriteTxnQueueDataToFile_FailsAnd_wq_IsUpAnd_q { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -2695,8 +2695,8 @@ void Test_CF_CmdWriteQueue_When_CF_WriteHistoryQueueDataToFile_FailsAnd_wq_IsUpA { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -2756,8 +2756,8 @@ void Test_CF_CmdWriteQueue_When_CF_WriteHistoryDataToFile_FailsOnFirstCallAnd_wq { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -2817,8 +2817,8 @@ void Test_CF_CmdWriteQueue_When_CF_WriteHistoryDataToFile_FailsOnSecondCallAnd_w { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -2881,8 +2881,8 @@ void Test_CF_CmdWriteQueue_When_CF_WriteHistoryQueueDataToFile_FailsAnd_wq_IsDow { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -2942,8 +2942,8 @@ void Test_CF_CmdWriteQueue_When_CF_WriteHistoryQueueDataToFile_FailsAnd_wq_IsDow { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -3002,8 +3002,8 @@ void Test_CF_CmdWriteQueue_SuccessCall_CF_CmdAcc_type_AllAnd_q_All(void) { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -3056,8 +3056,8 @@ void Test_CF_CmdWriteQueue_SuccessCall_CF_CmdAcc_type_AllAnd_q_History(void) { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -3105,8 +3105,8 @@ void Test_CF_CmdWriteQueue_SuccessCall_CF_CmdAcc_type_AllAnd_q_Active(void) { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -3154,8 +3154,8 @@ void Test_CF_CmdWriteQueue_SuccessCall_CF_CmdAcc_type_AllAnd_q_Pend(void) { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -3203,8 +3203,8 @@ void Test_CF_CmdWriteQueue_SuccessCall_CF_CmdAcc_type_UpAnd_q_All(void) { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -3257,8 +3257,8 @@ void Test_CF_CmdWriteQueue_SuccessCall_CF_CmdAcc_type_UpAnd_q_History(void) { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -3306,8 +3306,8 @@ void Test_CF_CmdWriteQueue_SuccessCall_CF_CmdAcc_type_UpAnd_q_Active(void) { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -3357,8 +3357,8 @@ void Test_CF_CmdWriteQueue_SuccessCall_CF_CmdAcc_type_DownAnd_q_All(void) { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -3406,8 +3406,8 @@ void Test_CF_CmdWriteQueue_SuccessCall_CF_CmdAcc_type_DownAnd_q_History(void) { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -3455,8 +3455,8 @@ void Test_CF_CmdWriteQueue_SuccessCall_CF_CmdAcc_type_DownAnd_q_Active(void) { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -3504,8 +3504,8 @@ void Test_CF_CmdWriteQueue_SuccessCall_CF_CmdAcc_type_DownAnd_q_Pend(void) { /* Arrange */ CF_UT_cmd_write_q_buf_t utbuf; - CF_WriteQueueCmd_t *dummy_wq = &utbuf.wq; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_WriteQueueCmd_t * dummy_wq = &utbuf.wq; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -3561,7 +3561,7 @@ void Test_CF_CmdSendCfgParams_Set_cfg_TimeStampAndSendMsg_AcceptCommand(void) { /* Arrange */ CFE_SB_Buffer_t utbuf; - CFE_SB_Buffer_t *arg_msg = &utbuf; + CFE_SB_Buffer_t * arg_msg = &utbuf; CF_ConfigTable_t dummy_config_table; CFE_TIME_SysTime_t fake_time; CFE_SB_TransmitMsg_context_t context_CFE_SB_TransmitMsg; @@ -3836,8 +3836,8 @@ void Test_CF_CmdSetParam_Call_CF_CmdGetSetParam_With_cmd_key_And_cmd_value(void) { /* Arrange */ CF_UT_cmd_set_param_args_buf_t utbuf; - CF_SetParamCmd_t *dummy_msg = &utbuf.sp; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_SetParamCmd_t * dummy_msg = &utbuf.sp; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; /* Arrange unstubbable: CF_CmdGetSetParam */ CF_ConfigTable_t dummy_config_table; @@ -3884,8 +3884,8 @@ void Test_CF_CmdGetParam_Call_CF_CmdGetSetParam_With_cmd_data_byte_0_AndConstant { /* Arrange */ CF_UT_cmd_get_param_args_buf_t utbuf; - CF_GetParamCmd_t *dummy_msg = &utbuf.gp; - CFE_SB_Buffer_t *arg_msg = &utbuf.buf; + CF_GetParamCmd_t * dummy_msg = &utbuf.gp; + CFE_SB_Buffer_t * arg_msg = &utbuf.buf; memset(&utbuf, 0, sizeof(utbuf)); @@ -4080,9 +4080,9 @@ void Test_CF_ProcessGroundCommand_When_cmd_EqTo_CF_NUM_COMMANDS_FailAndSendEvent { /* Arrange */ CFE_SB_Buffer_t utbuf; - CFE_SB_Buffer_t *arg_msg = &utbuf; + CFE_SB_Buffer_t * arg_msg = &utbuf; CFE_MSG_FcnCode_t forced_return_CFE_MSG_GetFcnCode = CF_NUM_COMMANDS; - const char *expected_Spec = "CF: invalid ground command packet cmd_code=0x%02x"; + const char * expected_Spec = "CF: invalid ground command packet cmd_code=0x%02x"; CFE_MSG_GetFcnCode_context_t context_CFE_MSG_GetFcnCode; CFE_EVS_SendEvent_context_t context_CFE_EVS_SendEvent; @@ -4125,10 +4125,10 @@ void Test_CF_ProcessGroundCommand_When_cmd_GreaterThan_CF_NUM_COMMANDS_FailAndSe { /* Arrange */ CFE_SB_Buffer_t utbuf; - CFE_SB_Buffer_t *arg_msg = &utbuf; + CFE_SB_Buffer_t * arg_msg = &utbuf; CFE_MSG_FcnCode_t forced_return_CFE_MSG_GetFcnCode = Any_uint8_GreaterThan(CF_NUM_COMMANDS); CFE_MSG_GetFcnCode_context_t context_CFE_MSG_GetFcnCode; - const char *expected_Spec = "CF: invalid ground command packet cmd_code=0x%02x"; + const char * expected_Spec = "CF: invalid ground command packet cmd_code=0x%02x"; CFE_EVS_SendEvent_context_t context_CFE_EVS_SendEvent; memset(&utbuf, 0, sizeof(utbuf)); @@ -4171,11 +4171,15 @@ void Test_CF_ProcessGroundCommand_Receives_cmd_AndLengthDoesNotMatchExpectedForT { /* Arrange */ CFE_SB_Buffer_t utbuf; - CFE_SB_Buffer_t *arg_msg = &utbuf; + CFE_SB_Buffer_t * arg_msg = &utbuf; CFE_MSG_FcnCode_t forced_return_CFE_MSG_GetFcnCode = 0x00; /* 0x00 forces fns[0] which is CF_CmdNoop */ - CFE_MSG_Size_t forced_return_CFE_MSG_GetSize = Any_uint16_Except( - sizeof(CF_NoArgsCmd_t)); /* sizeof(CF_NoArgsCmd_t) is expected size of CF_CmdNoop, using uint16 as a - reasonable size constraint here as size_t is at least 16 bit */ + + /* + * sizeof(CF_NoArgsCmd_t) is expected size of CF_CmdNoop, using uint16 as a + * reasonable size constraint here as size_t is at least 16 bit + */ + CFE_MSG_Size_t forced_return_CFE_MSG_GetSize = Any_uint16_Except(sizeof(CF_NoArgsCmd_t)); + const char *expected_Spec = "CF: invalid ground command length for command 0x%02x, expected %d got %zd"; CFE_MSG_GetFcnCode_context_t context_CFE_MSG_GetFcnCode; CFE_MSG_GetSize_context_t context_CFE_MSG_GetSize; @@ -4224,11 +4228,11 @@ void Test_CF_ProcessGroundCommand_ReceivesCmdCode_0x00_AndCall_CF_CmdNoop_With_m { /* Arrange */ CFE_SB_Buffer_t utbuf; - CFE_SB_Buffer_t *arg_msg = &utbuf; + CFE_SB_Buffer_t * arg_msg = &utbuf; CFE_MSG_FcnCode_t forced_return_CFE_MSG_GetFcnCode = 0x00; /* 0x00 forces fns[0] which is CF_CmdNoop */ CFE_MSG_Size_t forced_return_CFE_MSG_GetSize = sizeof(CF_NoArgsCmd_t); /* sizeof(CF_NoArgsCmd_t) is expected size of CF_CmdNoop */ - const char *expected_Spec = "CF: No-Op received, Version %d.%d.%d"; + const char * expected_Spec = "CF: No-Op received, Version %d.%d.%d"; CFE_MSG_GetFcnCode_context_t context_CFE_MSG_GetFcnCode; CFE_MSG_GetSize_context_t context_CFE_MSG_GetSize; CFE_EVS_SendEvent_context_t context_CFE_EVS_SendEvent; @@ -4279,7 +4283,7 @@ void Test_CF_ProcessGroundCommand_ReceivesCmdCode_0x0C_AndDoNothingBecause_fns_1 { /* Arrange */ CFE_SB_Buffer_t utbuf; - CFE_SB_Buffer_t *arg_msg = &utbuf; + CFE_SB_Buffer_t * arg_msg = &utbuf; CFE_MSG_FcnCode_t forced_return_CFE_MSG_GetFcnCode = 0x0C; /* 0x0C forces a null slot */ CFE_MSG_Size_t forced_return_CFE_MSG_GetSize = 0; CFE_MSG_GetFcnCode_context_t context_CFE_MSG_GetFcnCode; diff --git a/unit-test/cf_crc_tests.c b/unit-test/cf_crc_tests.c index 8bd7059b..9a8362bd 100644 --- a/unit-test/cf_crc_tests.c +++ b/unit-test/cf_crc_tests.c @@ -99,7 +99,7 @@ void Test_CF_CRC_Digest_When_len_Is_0_DoNotAlter_c_working_or_c_result_or_c_inde { /* Arrange */ CF_Crc_t dummy_c; - CF_Crc_t *arg_c = &dummy_c; + CF_Crc_t * arg_c = &dummy_c; const uint8 arg_data[1] = {UT_UINT_8_DEFAULT}; int32 arg_len = 0; uint32 initial_c_working = Any_uint32(); @@ -124,7 +124,7 @@ void Test_CF_CRC_Digest_When_len_Eq_1_PushDataLeftOnto_c_working(void) { /* Arrange */ CF_Crc_t dummy_c; - CF_Crc_t *arg_c = &dummy_c; + CF_Crc_t * arg_c = &dummy_c; const uint8 arg_data[1] = {UT_UINT_8_DEFAULT}; int32 arg_len = 1; int i = 0; @@ -149,7 +149,7 @@ void Test_CF_CRC_Digest_PushDataLeftOnto_c_working_NumberOfTimesEqTo_len(void) { /* Arrange */ CF_Crc_t dummy_c; - CF_Crc_t *arg_c = &dummy_c; + CF_Crc_t * arg_c = &dummy_c; const uint8 *arg_data; int32 arg_len; int i = 0; @@ -187,7 +187,7 @@ void Test_CF_CRC_Digest_When_index_IsNot_3_DoNotUpdate_c_result(void) { /* Arrange */ CF_Crc_t dummy_c; - CF_Crc_t *arg_c = &dummy_c; + CF_Crc_t * arg_c = &dummy_c; const uint8 arg_data[1] = {UT_UINT_8_DEFAULT}; int32 arg_len = 1; uint32 initial_c_result = Any_uint32(); @@ -208,7 +208,7 @@ void Test_CF_CRC_Digest_When_c_index_Is_3_Update_c_result(void) { /* Arrange */ CF_Crc_t dummy_c; - CF_Crc_t *arg_c = &dummy_c; + CF_Crc_t * arg_c = &dummy_c; const uint8 arg_data[1] = {UT_UINT_8_DEFAULT}; int32 arg_len; int i = 0; @@ -236,7 +236,7 @@ void Test_CF_CRC_Digest_Update_c_result_TheNumberOfTimes_index_Reaches4(void) { /* Arrange */ CF_Crc_t dummy_c; - CF_Crc_t *arg_c = &dummy_c; + CF_Crc_t * arg_c = &dummy_c; const uint8 *arg_data; int32 arg_len; uint32 dummy_c_working; @@ -301,7 +301,7 @@ void Test_CF_CRC_Digest_When_len_Eq1_And_c_index_LessThan_3_Update_c_index_By_1( { /* Arrange */ CF_Crc_t dummy_c; - CF_Crc_t *arg_c = &dummy_c; + CF_Crc_t * arg_c = &dummy_c; const uint8 arg_data[1] = {UT_UINT_8_DEFAULT}; int32 arg_len; uint8 expected_c_index; @@ -325,7 +325,7 @@ void Test_CF_CRC_Digest_When_len_Eq1_And_c_index_Is_3_Update_c_index_To_0(void) { /* Arrange */ CF_Crc_t dummy_c; - CF_Crc_t *arg_c = &dummy_c; + CF_Crc_t * arg_c = &dummy_c; const uint8 arg_data[1] = {UT_UINT_8_DEFAULT}; int32 arg_len; @@ -346,7 +346,7 @@ void Test_CF_CRC_Digest_Update_c_index_CorrectlyDependingOn_c_index_And_len_Valu { /* Arrange */ CF_Crc_t dummy_c; - CF_Crc_t *arg_c = &dummy_c; + CF_Crc_t * arg_c = &dummy_c; const uint8 *arg_data; int32 arg_len; uint8 expected_c_index; diff --git a/unit-test/cf_utils_tests.c b/unit-test/cf_utils_tests.c index 30448941..528be0ce 100644 --- a/unit-test/cf_utils_tests.c +++ b/unit-test/cf_utils_tests.c @@ -29,7 +29,7 @@ typedef struct { CF_Transaction_t *t; - void *context; + void * context; } UT_Callback_CF_TraverseAllTransactions_context_t; /******************************************************************************* @@ -144,7 +144,7 @@ void Test_CF_FindUnusedTransaction(void) /* Test case for: * CF_Transaction_t *CF_FindUnusedTransaction(CF_Channel_t *c) */ - CF_Channel_t *c; + CF_Channel_t * c; CF_Transaction_t txn; CF_History_t hist; @@ -243,7 +243,7 @@ void Test_CF_FindTransactionBySequenceNumber(void) */ CF_Transaction_t *t; - CF_Channel_t *c; + CF_Channel_t * c; memset(&CF_AppData, 0, sizeof(CF_AppData)); c = &CF_AppData.engine.channels[UT_CFDP_CHANNEL]; @@ -309,7 +309,7 @@ void Test_cf_dequeue_transaction_Call_CF_CList_Remove_AndDecrement_q_size(void) CF_Transaction_t arg_t; uint8 dummy_chan_num = Any_uint8_LessThan(CF_NUM_CHANNELS); CF_CListNode_t **expected_head; - CF_CListNode_t *expected_cl_node; + CF_CListNode_t * expected_cl_node; uint16 initial_q_size = Any_uint16_Except(0); /* 0 will CF_Assert */ CF_CList_Remove_context_t context_clist_remove; @@ -377,10 +377,10 @@ void Test_cf_move_transaction_Call_CF_CList_InsertBack_AndSet_q_index_ToGiven_q( CF_Transaction_t dummy_t; CF_Transaction_t *arg_t = &dummy_t; uint8 dummy_chan_num = Any_uint8_LessThan(CF_NUM_CHANNELS); - CF_CListNode_t **expected_remove_head; - CF_CListNode_t *expected_remove_node; - CF_CListNode_t **expected_insert_back_head; - CF_CListNode_t *expected_insert_back_node; + CF_CListNode_t ** expected_remove_head; + CF_CListNode_t * expected_remove_node; + CF_CListNode_t ** expected_insert_back_head; + CF_CListNode_t * expected_insert_back_node; CF_QueueIdx_t arg_q = Any_cf_queue_index_t(); memset(&dummy_t, 0, sizeof(dummy_t)); @@ -450,12 +450,12 @@ void Test_CF_CList_Remove_Ex_AssertsBecause_q_size_Eq0(void) void Test_CF_CList_Remove_Ex_Call_CF_CList_Remove_AndDecrement_q_size(void) { /* Arrange */ - CF_Channel_t *arg_c = &CF_AppData.engine.channels[Any_uint32_LessThan(CF_NUM_CHANNELS)]; + CF_Channel_t * arg_c = &CF_AppData.engine.channels[Any_uint32_LessThan(CF_NUM_CHANNELS)]; CF_QueueIdx_t arg_index = Any_cf_queue_index_t(); CF_CListNode_t dummy_node; - CF_CListNode_t *arg_node = &dummy_node; + CF_CListNode_t * arg_node = &dummy_node; CF_CListNode_t **expected_remove_head; - CF_CListNode_t *expected_remove_node; + CF_CListNode_t * expected_remove_node; uint16 initial_q_size = Any_uint16_Except(0); CF_CList_Remove_context_t context_clist_remove; @@ -486,12 +486,12 @@ void Test_CF_CList_Remove_Ex_Call_CF_CList_Remove_AndDecrement_q_size(void) void Test_CF_CList_InsertAfter_Ex_Call_CF_CList_InsertAfter_AndIncrement_q_size(void) { /* Arrange */ - CF_Channel_t *arg_c = &CF_AppData.engine.channels[Any_uint32_LessThan(CF_NUM_CHANNELS)]; + CF_Channel_t * arg_c = &CF_AppData.engine.channels[Any_uint32_LessThan(CF_NUM_CHANNELS)]; CF_QueueIdx_t arg_index = Any_cf_queue_index_t(); CF_CListNode_t dummy_start; - CF_CListNode_t *arg_start = &dummy_start; + CF_CListNode_t * arg_start = &dummy_start; CF_CListNode_t dummy_after; - CF_CListNode_t *arg_after = &dummy_after; + CF_CListNode_t * arg_after = &dummy_after; uint16 initial_q_size = Any_uint16(); CF_CListNode_t **expected_insert_after_head = &arg_c->qs[arg_index]; @@ -523,13 +523,13 @@ void Test_CF_CList_InsertAfter_Ex_Call_CF_CList_InsertAfter_AndIncrement_q_size( void Test_CF_CList_InsertBack_Ex_Call_CF_CList_InsertBack_AndIncrement_q_size(void) { /* Arrange */ - CF_Channel_t *arg_c = &CF_AppData.engine.channels[Any_uint32_LessThan(CF_NUM_CHANNELS)]; + CF_Channel_t * arg_c = &CF_AppData.engine.channels[Any_uint32_LessThan(CF_NUM_CHANNELS)]; CF_QueueIdx_t arg_index = Any_cf_queue_index_t(); CF_CListNode_t dummy_node; - CF_CListNode_t *arg_node = &dummy_node; + CF_CListNode_t * arg_node = &dummy_node; uint16 initial_q_size = Any_uint16(); CF_CListNode_t **expected_insert_back_head; - CF_CListNode_t *expected_insert_back_node; + CF_CListNode_t * expected_insert_back_node; CF_CList_InsertBack_context_t context_clist_insert_back; UT_SetDataBuffer(UT_KEY(CF_CList_InsertBack), &context_clist_insert_back, sizeof(context_clist_insert_back), false); @@ -736,9 +736,9 @@ void Test_CF_PrioSearch_When_t_PrioIsGreaterThanContextPrioReturn_CLIST_CONT(voi { /* Arrange */ CF_Transaction_t dummy_t; - CF_CListNode_t *arg_node = &dummy_t.cl_node; + CF_CListNode_t * arg_node = &dummy_t.cl_node; CF_Traverse_PriorityArg_t dummy_p; - void *arg_context = (void *)&dummy_p; + void * arg_context = (void *)&dummy_p; int32 result; dummy_t.priority = Any_uint8_Except(0); @@ -756,9 +756,9 @@ void Test_CF_PrioSearch_When_t_PrioIsEqToContextPrio_Set_context_t_To_t_AndRetur { /* Arrange */ CF_Transaction_t dummy_t; - CF_CListNode_t *arg_node = &dummy_t.cl_node; + CF_CListNode_t * arg_node = &dummy_t.cl_node; CF_Traverse_PriorityArg_t dummy_p; - void *arg_context = (void *)&dummy_p; + void * arg_context = (void *)&dummy_p; int32 result; /* NOTE: these are inverted from previous test! */ @@ -778,9 +778,9 @@ void Test_CF_PrioSearch_When_t_PrioIsLessThanContextPrio_Set_context_t_To_t_AndR { /* Arrange */ CF_Transaction_t dummy_t; - CF_CListNode_t *arg_node = &dummy_t.cl_node; + CF_CListNode_t * arg_node = &dummy_t.cl_node; CF_Traverse_PriorityArg_t dummy_p; - void *arg_context = (void *)&dummy_p; + void * arg_context = (void *)&dummy_p; int32 result; /* NOTE: these are inverted from previous test! */ @@ -830,9 +830,9 @@ void Test_CF_InsertSortPrio_Call_CF_CList_InsertBack_Ex_ListIsEmpty_AndSet_q_ind CF_Transaction_t dummy_t; CF_Transaction_t *arg_t = &dummy_t; CF_QueueIdx_t arg_q = Any_cf_queue_index_t(); - CF_Channel_t *dummy_c; - CF_CListNode_t **expected_insert_back_head; - CF_CListNode_t *expected_insert_back_node; + CF_Channel_t * dummy_c; + CF_CListNode_t ** expected_insert_back_head; + CF_CListNode_t * expected_insert_back_node; /* dummy_t settings to bypass CF_Assert */ dummy_t.chan_num = Any_uint8_LessThan(CF_NUM_CHANNELS); @@ -868,13 +868,13 @@ void Test_CF_InsertSortPrio_Call_CF_CList_InsertAfter_Ex_AndSet_q_index_To_q(voi CF_Transaction_t dummy_t; CF_Transaction_t *arg_t = &dummy_t; CF_QueueIdx_t arg_q = Any_cf_queue_index_t(); - CF_CListNode_t *dummy_qs; - CF_Channel_t *dummy_c; - CF_CListNode_t *expected_end; + CF_CListNode_t * dummy_qs; + CF_Channel_t * dummy_c; + CF_CListNode_t * expected_end; CF_CListFn_t expected_fn; - CF_CListNode_t **expected_insert_after_head; - CF_CListNode_t **expected_insert_after_start; - CF_CListNode_t **expected_insert_after_after; + CF_CListNode_t ** expected_insert_after_head; + CF_CListNode_t ** expected_insert_after_start; + CF_CListNode_t ** expected_insert_after_after; CF_CList_Traverse_R_context_t context_cf_clist_traverse_r; UT_SetHandlerFunction(UT_KEY(CF_CList_Traverse_R), UT_AltHandler_CF_CList_Traverse_R_PRIO, @@ -926,12 +926,12 @@ void Test_CF_InsertSortPrio_When_p_t_Is_NULL_Call_CF_CList_InsertBack_Ex(void) CF_Transaction_t dummy_t; CF_Transaction_t *arg_t = &dummy_t; CF_QueueIdx_t arg_q = Any_cf_queue_index_t(); - CF_CListNode_t *dummy_qs; - CF_Channel_t *dummy_c; - CF_CListNode_t *expected_end; + CF_CListNode_t * dummy_qs; + CF_Channel_t * dummy_c; + CF_CListNode_t * expected_end; CF_CListFn_t expected_fn; - CF_CListNode_t **expected_insert_back_head; - CF_CListNode_t *expected_insert_back_node; + CF_CListNode_t ** expected_insert_back_head; + CF_CListNode_t * expected_insert_back_node; CF_CList_Traverse_R_context_t context_cf_clist_traverse_r; UT_SetDataBuffer(UT_KEY(CF_CList_Traverse_R), &context_cf_clist_traverse_r, sizeof(context_cf_clist_traverse_r), @@ -987,14 +987,14 @@ void Test_CF_TraverseAllTransactions_Impl_GetContainer_t_Call_args_fn_AndAdd_1_T { /* Arrange */ CF_Transaction_t dummy_t; - CF_CListNode_t *arg_n = &dummy_t.cl_node; + CF_CListNode_t * arg_n = &dummy_t.cl_node; CF_TraverseAll_Arg_t dummy_args; CF_TraverseAll_Arg_t *arg_args; int dummy_context_val; - void *dummy_context = &dummy_context_val; + void * dummy_context = &dummy_context_val; int initial_args_counter = Any_int(); - CF_Transaction_t *expected_t; - void *expected_context; + CF_Transaction_t * expected_t; + void * expected_context; int32 result; dummy_args.fn = UT_Callback_CF_TraverseAllTransactions; @@ -1034,9 +1034,9 @@ void Test_CF_TraverseAllTransactions_CallOtherFunction_CF_Q_RX_TimesAndReturn_ar { /* Arrange */ CF_Channel_t dummy_c; - CF_Channel_t *arg_c; + CF_Channel_t * arg_c; int dummy_context; - void *arg_context = &dummy_context; + void * arg_context = &dummy_context; uint8 expected_count = CF_QueueIdx_RX - CF_QueueIdx_PEND + 1; CF_CListNode_t *expected_qs_nodes[expected_count]; @@ -1115,7 +1115,7 @@ void Test_CF_WrappedOpen_Call_OS_OpenCreate_WithGivenArgumentsAndReturnItsReturn osal_id_t dummy_fd; osal_id_t *arg_fd = &dummy_fd; char dummy_fname; - char *arg_fname = &dummy_fname; + char * arg_fname = &dummy_fname; int32 arg_flags = Any_uint32(); int32 arg_access = Any_uint32(); int32 forced_return_OS_OpenCreate = Any_int32(); @@ -1180,7 +1180,7 @@ void Test_CF_WrappedRead_CallsOS_read_WithGivenArgumentsAndReturnItsReturnValue( /* Arrange */ uint32 arg_read_size = Any_uint32_LessThan_or_EqualTo(10); // 10 is arbitrary to make test fast uint8 dummy_buf[10] = {0}; // 10 to match max read size of 10 (arbitrary) - void *arg_buf = &dummy_buf; + void * arg_buf = &dummy_buf; UT_SetDefaultReturnValue(UT_KEY(OS_read), arg_read_size); @@ -1201,7 +1201,7 @@ void Test_CF_WrappedWrite_Call_OS_write_WithGivenArgumentsAndReturnItsReturnValu { /* Arrange */ uint8 dummy_buf; - void *arg_buf = &dummy_buf; + void * arg_buf = &dummy_buf; uint32 test_write_size = Any_uint32(); int32 expected_result = Any_int32(); diff --git a/unit-test/stubs/cf_cfdp_handlers.c b/unit-test/stubs/cf_cfdp_handlers.c index 0c4df2bc..7544dca8 100644 --- a/unit-test/stubs/cf_cfdp_handlers.c +++ b/unit-test/stubs/cf_cfdp_handlers.c @@ -74,7 +74,7 @@ void UT_DefaultHandler_CF_CFDP_ConstructPduHeader(void *UserObj, UT_EntryKey_t F void UT_DefaultHandler_CF_CFDP_TxFile(void *UserObj, UT_EntryKey_t FuncKey, const UT_StubContext_t *Context) { CF_CFDP_TxFile_context_t *ctxt = UT_CF_GetContextBuffer(FuncKey, CF_CFDP_TxFile_context_t); - const char *ptr; + const char * ptr; if (ctxt) { @@ -101,7 +101,7 @@ void UT_DefaultHandler_CF_CFDP_TxFile(void *UserObj, UT_EntryKey_t FuncKey, cons void UT_DefaultHandler_CF_CFDP_PlaybackDir(void *UserObj, UT_EntryKey_t FuncKey, const UT_StubContext_t *Context) { CF_CFDP_PlaybackDir_context_t *ctxt = UT_CF_GetContextBuffer(FuncKey, CF_CFDP_PlaybackDir_context_t); - const char *ptr; + const char * ptr; if (ctxt) { diff --git a/unit-test/utilities/cf_test_alt_handler.c b/unit-test/utilities/cf_test_alt_handler.c index 41362ea3..0448b9c9 100644 --- a/unit-test/utilities/cf_test_alt_handler.c +++ b/unit-test/utilities/cf_test_alt_handler.c @@ -112,7 +112,7 @@ void UT_AltHandler_CF_CList_Traverse_POINTER(void *UserObj, UT_EntryKey_t FuncKe void UT_AltHandler_CF_CList_Traverse_R_PRIO(void *UserObj, UT_EntryKey_t FuncKey, const UT_StubContext_t *Context) { CF_CList_Traverse_R_context_t *ctxt; - CF_Traverse_PriorityArg_t *arg = UT_Hook_GetArgValueByName(Context, "context", CF_Traverse_PriorityArg_t *); + CF_Traverse_PriorityArg_t * arg = UT_Hook_GetArgValueByName(Context, "context", CF_Traverse_PriorityArg_t *); if (UserObj) { diff --git a/unit-test/utilities/cf_test_utils.c b/unit-test/utilities/cf_test_utils.c index e95b0c7f..6899c4d7 100644 --- a/unit-test/utilities/cf_test_utils.c +++ b/unit-test/utilities/cf_test_utils.c @@ -36,10 +36,10 @@ static uint16 UT_CF_CapturedEventIDs[4]; void *UT_CF_GetContextBufferImpl(UT_EntryKey_t FuncKey, size_t ReqSize) { - void *TempPtr; + void * TempPtr; size_t ActualSize; size_t Position; - void *Val; + void * Val; UT_GetDataBuffer(FuncKey, &TempPtr, &ActualSize, &Position); diff --git a/unit-test/utilities/cf_test_utils.h b/unit-test/utilities/cf_test_utils.h index bea569ba..3801ea00 100644 --- a/unit-test/utilities/cf_test_utils.h +++ b/unit-test/utilities/cf_test_utils.h @@ -106,16 +106,16 @@ typedef struct typedef struct { - CF_Channel_t *c; + CF_Channel_t * c; CF_TransactionSeq_t transaction_sequence_number; CF_EntityId_t src_eid; - CF_Transaction_t *forced_return; + CF_Transaction_t * forced_return; } CF_FindTransactionBySequenceNumber_context_t; typedef struct { CF_TraverseAllTransactions_fn_t fn; - void *context; + void * context; int forced_return; } CF_TraverseAllTransactions_All_Channels_context_t; @@ -135,7 +135,7 @@ typedef struct { CF_CListNode_t *start; CF_CListFn_t fn; - void *context; + void * context; } CF_CList_Traverse_POINTER_context_t; typedef struct @@ -148,21 +148,21 @@ typedef struct typedef struct { int32 fd; - CF_Channel_t *c; + CF_Channel_t * c; CF_Direction_t dir; } CF_WriteHistoryQueueDataToFile_context_t; typedef struct { - CF_Channel_t *c; + CF_Channel_t * c; CF_TraverseAllTransactions_fn_t fn; - void *context; + void * context; /* TODO: add forced return? Stub is kinda using it but not from context */ } CF_TraverseAllTransactions_context_t; typedef struct { - osal_id_t *fd; + osal_id_t * fd; const char *fname; int32 flags; int32 access; @@ -172,26 +172,26 @@ typedef struct typedef struct { CF_CListNode_t **head; - CF_CListNode_t *node; + CF_CListNode_t * node; } CF_CList_Remove_context_t; typedef struct { CF_CListNode_t **head; - CF_CListNode_t *forced_return; + CF_CListNode_t * forced_return; } CF_CList_Pop_context_t; typedef struct { CF_CListNode_t **head; - CF_CListNode_t *node; + CF_CListNode_t * node; } CF_CList_InsertBack_context_t; typedef struct { CF_CListNode_t **head; - CF_CListNode_t *start; - CF_CListNode_t *after; + CF_CListNode_t * start; + CF_CListNode_t * after; } CF_CList_InsertAfter_context_t; typedef struct @@ -205,16 +205,16 @@ typedef struct typedef struct { - CF_CListNode_t *start; + CF_CListNode_t * start; CF_CListFn_t fn; CF_TraverseAllTransactions_fn_t context_fn; - void *context_context; + void * context_context; int context_counter; } CF_CList_Traverse_TRAVERSE_ALL_ARGS_T_context_t; typedef struct { - CF_CListNode_t *end; + CF_CListNode_t * end; CF_CListFn_t fn; CF_Transaction_t *context_t; } CF_CList_Traverse_R_context_t; @@ -289,9 +289,9 @@ int Any_int_Negative(void); int Any_int_Positive(void); int Any_int_PositiveExcept(int exception); int Any_int_ZeroOrPositiveLessThan(int ceiling); -char *AnyFilenameOfLength(size_t length); -char *AnyRandomStringOfTextOfLength(size_t stringLength); -char *AnyRandomStringOfLettersOfLength(size_t length); +char * AnyFilenameOfLength(size_t length); +char * AnyRandomStringOfTextOfLength(size_t stringLength); +char * AnyRandomStringOfLettersOfLength(size_t length); void AnyRandomStringOfLettersOfLengthCopy(char *random_string, size_t length); uint8 Any_cf_chan_num(void); diff --git a/unit-test/utilities/ut_utils_cfe_hooks.h b/unit-test/utilities/ut_utils_cfe_hooks.h index ef0f044b..27b45455 100644 --- a/unit-test/utilities/ut_utils_cfe_hooks.h +++ b/unit-test/utilities/ut_utils_cfe_hooks.h @@ -35,7 +35,7 @@ typedef struct typedef struct { const CFE_MSG_Message_t *MsgPtr; - CFE_SB_MsgId_t *returned_MsgId; + CFE_SB_MsgId_t * returned_MsgId; } CFE_MSG_GetMsgId_context_t; typedef struct @@ -48,7 +48,7 @@ typedef struct typedef struct { const CFE_MSG_Message_t *MsgPtr; - CFE_MSG_Size_t *Size; + CFE_MSG_Size_t * Size; } CFE_MSG_GetSize_context_t; typedef struct @@ -66,7 +66,7 @@ typedef struct typedef struct { const CFE_MSG_Message_t *MsgPtr; - CFE_MSG_FcnCode_t *FcnCode; + CFE_MSG_FcnCode_t * FcnCode; } CFE_MSG_GetFcnCode_context_t; typedef struct