Skip to content

Commit

Permalink
Merge pull request #326 from thnkslprpt/patch-1
Browse files Browse the repository at this point in the history
Fix #30, Correct 2 aberrant instances of CF_Transaction_t argument name
  • Loading branch information
dzbaker authored Oct 3, 2022
2 parents ceca7b1 + a6b47a8 commit a0d061a
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions fsw/src/cf_cfdp.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@ void CF_CFDP_ArmAckTimer(CF_Transaction_t *t)
* Internal helper routine only, not part of API.
*
*-----------------------------------------------------------------*/
static inline CF_CFDP_Class_t CF_CFDP_GetClass(const CF_Transaction_t *ti)
static inline CF_CFDP_Class_t CF_CFDP_GetClass(const CF_Transaction_t *t)
{
CF_Assert(ti->flags.com.q_index != CF_QueueIdx_FREE);
return !!((ti->state == CF_TxnState_S2) || (ti->state == CF_TxnState_R2));
CF_Assert(t->flags.com.q_index != CF_QueueIdx_FREE);
return !!((t->state == CF_TxnState_S2) || (t->state == CF_TxnState_R2));
}

/*----------------------------------------------------------------
Expand All @@ -152,12 +152,12 @@ static inline CF_CFDP_Class_t CF_CFDP_GetClass(const CF_Transaction_t *ti)
* Internal helper routine only, not part of API.
*
*-----------------------------------------------------------------*/
static inline int CF_CFDP_IsSender(CF_Transaction_t *ti)
static inline int CF_CFDP_IsSender(CF_Transaction_t *t)
{
CF_Assert(ti->flags.com.q_index != CF_QueueIdx_FREE);
CF_Assert(t->flags.com.q_index != CF_QueueIdx_FREE);
/* the state could actually be CF_TxnState_IDLE, which is still not a sender. This would
* be an unused transaction in the RX (CF_CFDP_ReceiveMessage) path. */
return !!((ti->state == CF_TxnState_S1) || (ti->state == CF_TxnState_S2));
return !!((t->state == CF_TxnState_S1) || (t->state == CF_TxnState_S2));
}

/*----------------------------------------------------------------
Expand Down

0 comments on commit a0d061a

Please sign in to comment.