From 40166053ccf941943bc8214414cc3de687b9f6bb Mon Sep 17 00:00:00 2001
From: Joseph Hickey <joseph.p.hickey@nasa.gov>
Date: Tue, 11 Aug 2020 15:37:45 -0400
Subject: [PATCH] Update #778: Apply whitespace rules to new code

---
 cmake/arch_build.cmake                   |  1 +
 modules/cfe_assert/src/cfe_assert_io.c   | 14 +++++++-------
 modules/cfe_assert/src/cfe_assert_main.c | 12 ++++--------
 modules/cfe_test/src/cfe_test.c          |  2 --
 modules/cfe_test/src/cfe_test.h          |  3 +--
 modules/cfe_test/src/es_test.c           |  4 +---
 6 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/cmake/arch_build.cmake b/cmake/arch_build.cmake
index d3b98d4d3..db99d03e9 100644
--- a/cmake/arch_build.cmake
+++ b/cmake/arch_build.cmake
@@ -215,6 +215,7 @@ function(add_unit_test_exe UT_NAME UT_SRCS)
     add_test(${UT_NAME} ${UT_NAME})
 endfunction(add_unit_test_exe)
 
+
 ##################################################################
 #
 # FUNCTION: cfe_exec_do_install
diff --git a/modules/cfe_assert/src/cfe_assert_io.c b/modules/cfe_assert/src/cfe_assert_io.c
index 85fe44932..5c01213c3 100644
--- a/modules/cfe_assert/src/cfe_assert_io.c
+++ b/modules/cfe_assert/src/cfe_assert_io.c
@@ -62,23 +62,23 @@ void UT_BSP_StartTestSegment(uint32 SegmentNumber, const char *SegmentName)
 void UT_BSP_DoText(uint8 MessageType, const char *OutputMessage)
 {
     const char *Prefix;
-    uint32      MsgEnabled   = BSP_UT_Global.CurrVerbosity >> MessageType;
+    uint32      MsgEnabled = BSP_UT_Global.CurrVerbosity >> MessageType;
 
     if (MsgEnabled & 1)
     {
         switch (MessageType)
         {
             case UTASSERT_CASETYPE_ABORT:
-                Prefix       = "ABORT";
+                Prefix = "ABORT";
                 break;
             case UTASSERT_CASETYPE_FAILURE:
-                Prefix       = "FAIL";
+                Prefix = "FAIL";
                 break;
             case UTASSERT_CASETYPE_MIR:
-                Prefix       = "MIR";
+                Prefix = "MIR";
                 break;
             case UTASSERT_CASETYPE_TSF:
-                Prefix       = "TSF";
+                Prefix = "TSF";
                 break;
             case UTASSERT_CASETYPE_TTF:
                 Prefix = "TTF";
@@ -93,7 +93,7 @@ void UT_BSP_DoText(uint8 MessageType, const char *OutputMessage)
                 Prefix = "END";
                 break;
             case UTASSERT_CASETYPE_PASS:
-                Prefix       = "PASS";
+                Prefix = "PASS";
                 break;
             case UTASSERT_CASETYPE_INFO:
                 Prefix = "INFO";
@@ -131,7 +131,7 @@ void UT_BSP_EndTest(const UtAssert_TestCounter_t *TestCounters)
     }
 
     CFE_ES_WriteToSysLog("TEST COMPLETE: %u tests Segment(s) executed\n\n",
-             (unsigned int)TestCounters->TestSegmentCount);
+                         (unsigned int)TestCounters->TestSegmentCount);
 
     OS_TaskExit();
 }
diff --git a/modules/cfe_assert/src/cfe_assert_main.c b/modules/cfe_assert/src/cfe_assert_main.c
index d488be8ec..eb8e65652 100644
--- a/modules/cfe_assert/src/cfe_assert_main.c
+++ b/modules/cfe_assert/src/cfe_assert_main.c
@@ -43,7 +43,7 @@
  * The value is in milliseconds.  Normally this shouldn't be more than
  * a second or two for apps to all reach their respective main loop(s).
  */
-#define CFE_ASSERT_MAX_STARTUP_WAIT       30000
+#define CFE_ASSERT_MAX_STARTUP_WAIT 30000
 
 /*
  * Small Extra delay before starting tests.
@@ -54,15 +54,14 @@
  *
  * The value is in milliseconds.
  */
-#define CFE_ASSERT_START_DELAY            4000
-
+#define CFE_ASSERT_START_DELAY 4000
 
 /*
  * Entry point for this application
  */
 void CFE_Assert_AppMain(void)
 {
-    int32 rc;
+    int32  rc;
     uint32 RunStatus;
 
     /*
@@ -113,7 +112,7 @@ void CFE_Assert_AppMain(void)
      * registered during startup, then it self-exits.
      */
     RunStatus = CFE_ES_RunStatus_APP_RUN;
-    if(CFE_ES_RunLoop(&RunStatus))
+    if (CFE_ES_RunLoop(&RunStatus))
     {
         OS_TaskDelay(CFE_ASSERT_START_DELAY);
 
@@ -128,8 +127,5 @@ void CFE_Assert_AppMain(void)
         RunStatus = CFE_ES_RunStatus_APP_EXIT;
     }
 
-
     CFE_ES_ExitApp(RunStatus);
 }
-
-
diff --git a/modules/cfe_test/src/cfe_test.c b/modules/cfe_test/src/cfe_test.c
index fe5842928..d9606b9eb 100644
--- a/modules/cfe_test/src/cfe_test.c
+++ b/modules/cfe_test/src/cfe_test.c
@@ -41,5 +41,3 @@ int32 CFE_Test_Init(int32 LibId)
     UtTest_Add(ES_Test_AppId, NULL, NULL, "ES AppID");
     return CFE_SUCCESS;
 }
-
-
diff --git a/modules/cfe_test/src/cfe_test.h b/modules/cfe_test/src/cfe_test.h
index 77acd1e8a..45f98e890 100644
--- a/modules/cfe_test/src/cfe_test.h
+++ b/modules/cfe_test/src/cfe_test.h
@@ -38,8 +38,7 @@
 #include "uttest.h"
 #include "utassert.h"
 
-void ES_Test_AppId(void);
+void  ES_Test_AppId(void);
 int32 CFE_Test_Init(int32 LibId);
 
-
 #endif /* CFE_TEST_H */
diff --git a/modules/cfe_test/src/es_test.c b/modules/cfe_test/src/es_test.c
index 632b084aa..93ed3e840 100644
--- a/modules/cfe_test/src/es_test.c
+++ b/modules/cfe_test/src/es_test.c
@@ -33,14 +33,12 @@
 
 #include "cfe_test.h"
 
-
 void ES_Test_AppId(void)
 {
     uint32 AppId;
-    char AppNameBuf[OS_MAX_API_NAME+4];
+    char   AppNameBuf[OS_MAX_API_NAME + 4];
 
     UtAssert_INT32_EQ(CFE_ES_GetAppID(&AppId), CFE_SUCCESS);
     UtAssert_INT32_EQ(CFE_ES_GetAppName(AppNameBuf, AppId, sizeof(AppNameBuf)), CFE_SUCCESS);
     UtAssert_StrCmp(AppNameBuf, "ASSERT_APP", "CFE_ES_GetAppName() returned ASSERT_APP");
 }
-