Update variable in catch_assert file to allow uncrustify-ing (FreeRTO…

…S#419) * Update variable names to please uncrustify * Update the uncrustify script too
chinglee-iot · Feb 4, 2022 · 8678034 · 8678034
1 parent a067dff
commit 8678034
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -75,7 +75,7 @@ jobs:
       - name: Run Uncrustify
         run: |
           uncrustify --version
-          find . -not -path '.*catch_assert.h' -iname "*.[hc]" -exec uncrustify --check -c tools/uncrustify.cfg {} +
+          find . -iname "*.[hc]" -exec uncrustify --check -c tools/uncrustify.cfg {} +
           if [ "$?" = "0" ]; then
             exit 0
           else

diff --git a/.github/workflows/uncrustify.yml b/.github/workflows/uncrustify.yml
@@ -39,8 +39,8 @@ jobs:
       - name: Run Uncrustify
         run: |
           uncrustify --version
-          find . -not -path '.*catch_assert.h' -iname "*.[hc]" -exec uncrustify -c tools/uncrustify.cfg --no-backup --replace {} +
-          find . -not -path '.*catch_assert.h' -iname "*.[hc]" -exec uncrustify -c tools/uncrustify.cfg --no-backup --replace {} +
+          find .  -iname "*.[hc]" -exec uncrustify -c tools/uncrustify.cfg --no-backup --replace {} +
+          find .  -iname "*.[hc]" -exec uncrustify -c tools/uncrustify.cfg --no-backup --replace {} +
       - name: Push changes to upstream repository
         run: |
           git config --global user.name 'GitHub Action'

diff --git a/test/unit-test/catch_assert.h b/test/unit-test/catch_assert.h
@@ -53,25 +53,25 @@ static void catchHandler_( int signal )
 
 #define catch_assert( x )                    \
     do {                                     \
-        int try = 0, catch = 0;              \
+        int ltry = 0, lcatch = 0;            \
         int saveFd = dup( 2 );               \
         struct sigaction sa = { 0 }, saveSa; \
         sa.sa_handler = catchHandler_;       \
         sigaction( SIGABRT, &sa, &saveSa );  \
         close( 2 );                          \
         if( setjmp( CATCH_JMPBUF ) == 0 )    \
         {                                    \
-            try++;                           \
+            ltry++;                          \
             x;                               \
         }                                    \
         else                                 \
         {                                    \
-            catch++;                         \
+            lcatch++;                        \
         }                                    \
         sigaction( SIGABRT, &saveSa, NULL ); \
         dup2( saveFd, 2 );                   \
         close( saveFd );                     \
-        TEST_ASSERT_EQUAL( try, catch );     \
+        TEST_ASSERT_EQUAL( ltry, lcatch );   \
     } while( 0 )
 
 #endif /* ifndef CATCH_ASSERT_H_ */