Merge pull request #431 from jphickey/fix-430-type-mismatch

Fix #430, correct type mismatches

fsw/src/cf_cfdp.c

@@ -1054,15 +1054,15 @@ CFE_Status_t CF_CFDP_InitEngine(void)
  * See description in cf_cfdp.h for argument/return detail
  *
  *-----------------------------------------------------------------*/
-CFE_Status_t CF_CFDP_CycleTxFirstActive(CF_CListNode_t *node, void *context)
+CF_CListTraverse_Status_t CF_CFDP_CycleTxFirstActive(CF_CListNode_t *node, void *context)
 {
-    CF_CFDP_CycleTx_args_t *args = (CF_CFDP_CycleTx_args_t *)context;
-    CF_Transaction_t *      txn  = container_of(node, CF_Transaction_t, cl_node);
-    CFE_Status_t            ret  = 1; /* default option is exit traversal */
+    CF_CFDP_CycleTx_args_t *  args = (CF_CFDP_CycleTx_args_t *)context;
+    CF_Transaction_t *        txn  = container_of(node, CF_Transaction_t, cl_node);
+    CF_CListTraverse_Status_t ret  = CF_CLIST_EXIT; /* default option is exit traversal */
 
     if (txn->flags.com.suspended)
     {
-        ret = 0; /* suspended, so move on to next */
+        ret = CF_CLIST_CONT; /* suspended, so move on to next */
     }
     else
     {
@@ -1133,11 +1133,11 @@ void CF_CFDP_CycleTx(CF_Channel_t *chan)
  * See description in cf_cfdp.h for argument/return detail
  *
  *-----------------------------------------------------------------*/
-CFE_Status_t CF_CFDP_DoTick(CF_CListNode_t *node, void *context)
+CF_CListTraverse_Status_t CF_CFDP_DoTick(CF_CListNode_t *node, void *context)
 {
-    CFE_Status_t         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 *   txn  = container_of(node, CF_Transaction_t, cl_node);
+    CF_CListTraverse_Status_t 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 *        txn  = container_of(node, CF_Transaction_t, cl_node);
     if (!args->chan->cur || (args->chan->cur == txn))
     {
         /* found where we left off, so clear that and move on */
@@ -1787,7 +1787,7 @@ void CF_CFDP_CancelTransaction(CF_Transaction_t *txn)
  * See description in cf_cfdp.h for argument/return detail
  *
  *-----------------------------------------------------------------*/
-CFE_Status_t CF_CFDP_CloseFiles(CF_CListNode_t *node, void *context)
+CF_CListTraverse_Status_t CF_CFDP_CloseFiles(CF_CListNode_t *node, void *context)
 {
     CF_Transaction_t *txn = container_of(node, CF_Transaction_t, cl_node);
     if (OS_ObjectIdDefined(txn->fd))

fsw/src/cf_cfdp.h

@@ -602,7 +602,7 @@ void CF_CFDP_RecvIdle(CF_Transaction_t *txn, CF_Logical_PduBuffer_t *ph);
  * @returns integer traversal code
  * @retval Always CF_LIST_CONT indicate list traversal should not exit early.
  */
-CFE_Status_t CF_CFDP_CloseFiles(CF_CListNode_t *node, void *context);
+CF_CListTraverse_Status_t CF_CFDP_CloseFiles(CF_CListNode_t *node, void *context);
 
 /************************************************************************/
 /** @brief Cycle the current active tx or make a new one active.
@@ -640,7 +640,7 @@ void CF_CFDP_CycleTx(CF_Channel_t *chan);
  * @retval CF_CLIST_EXIT when it's found, which terminates list traversal
  * @retval CF_CLIST_CONT when it's isn't found, which causes list traversal to continue
  */
-CFE_Status_t CF_CFDP_CycleTxFirstActive(CF_CListNode_t *node, void *context);
+CF_CListTraverse_Status_t CF_CFDP_CycleTxFirstActive(CF_CListNode_t *node, void *context);
 
 /************************************************************************/
 /** @brief Call R and then S tick functions for all active transactions.
@@ -701,6 +701,6 @@ void CF_CFDP_ProcessPollingDirectories(CF_Channel_t *chan);
  * @retval CF_CLIST_EXIT when it's found, which terminates list traversal
  * @retval CF_CLIST_CONT when it's isn't found, which causes list traversal to continue
  */
-CFE_Status_t CF_CFDP_DoTick(CF_CListNode_t *node, void *context);
+CF_CListTraverse_Status_t CF_CFDP_DoTick(CF_CListNode_t *node, void *context);
 
 #endif /* !CF_CFDP_H */

fsw/src/cf_clist.c

@@ -202,7 +202,7 @@ void CF_CList_Traverse(CF_CListNode_t *start, CF_CListFn_t fn, void *context)
             {
                 last = 1;
             }
-            if (fn(node, context))
+            if (!CF_CListTraverse_Status_IS_CONTINUE(fn(node, context)))
             {
                 break;
             }
@@ -246,7 +246,7 @@ void CF_CList_Traverse_R(CF_CListNode_t *end, CF_CListFn_t fn, void *context)
                     last = 1;
                 }
 
-                if (fn(node, context))
+                if (!CF_CListTraverse_Status_IS_CONTINUE(fn(node, context)))
                 {
                     break;
                 }

fsw/src/cf_clist.h

@@ -27,9 +27,24 @@
 #define CF_CLIST_H
 
 #include <stddef.h>
+#include <stdbool.h>
 
-#define CF_CLIST_CONT (0) /**< \brief Constant indicating to continue traversal */
-#define CF_CLIST_EXIT (1) /**< \brief Constant indicating to stop traversal */
+typedef enum
+{
+    CF_CListTraverse_Status_CONTINUE = 0,
+    CF_CListTraverse_Status_EXIT     = 1
+} CF_CListTraverse_Status_t;
+
+#define CF_CLIST_CONT CF_CListTraverse_Status_CONTINUE /**< \brief Constant indicating to continue traversal */
+#define CF_CLIST_EXIT CF_CListTraverse_Status_EXIT     /**< \brief Constant indicating to stop traversal */
+
+/**
+ * Checks if the list traversal should continue
+ */
+static inline bool CF_CListTraverse_Status_IS_CONTINUE(CF_CListTraverse_Status_t stat)
+{
+    return (stat == CF_CListTraverse_Status_CONTINUE);
+}
 
 /**
  * @brief Node link structure
@@ -63,7 +78,7 @@ typedef struct CF_CListNode CF_CListNode_t;
  * @retval  #CF_CLIST_CONT Indicates to continue traversing the list
  * @retval  #CF_CLIST_EXIT Indicates to stop traversing the list
  */
-typedef int (*CF_CListFn_t)(CF_CListNode_t *node, void *context);
+typedef CF_CListTraverse_Status_t (*CF_CListFn_t)(CF_CListNode_t *node, void *context);
 
 /************************************************************************/
 /** @brief Initialize a clist node.