Merge pull request #544 from farrrb/bugfix/fix-issue-510

Bugfix/fix issue 510
2026-01-23 00:15:58 +01:00 · 2021-12-03 10:58:29 -05:00
parent 93850fab40 4cfb39290a
commit 8ba0138600
4 changed files with 77 additions and 56 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,37 +99,49 @@ set_target_properties(${PROJECT_NAME}

 target_compile_options(${PROJECT_NAME}
    PRIVATE
-        $<$<C_COMPILER_ID:Clang>:-Wcast-align
-                                 -Wcast-qual
-                                 -Wconversion
-                                 -Wexit-time-destructors
-                                 -Wglobal-constructors
-                                 -Wmissing-noreturn
-                                 -Wmissing-prototypes
-                                 -Wno-missing-braces
-                                 -Wold-style-cast
-                                 -Wshadow
-                                 -Wweak-vtables
-                                 -Werror
-                                 -Wall>
-        $<$<C_COMPILER_ID:GNU>:-Waddress
-                               -Waggregate-return
-                               -Wformat-nonliteral
-                               -Wformat-security
-                               -Wformat
-                               -Winit-self
-                               -Wmissing-declarations
-                               -Wmissing-include-dirs
-                               -Wno-multichar
-                               -Wno-parentheses
-                               -Wno-type-limits
-                               -Wno-unused-parameter
-                               -Wunreachable-code
-                               -Wwrite-strings
-                               -Wpointer-arith
-                               -Werror
-                               -Wall>
-       $<$<C_COMPILER_ID:MSVC>:/Wall>
+        # Clang
+        $<$<C_COMPILER_ID:Clang>:
+            -Wcast-align
+            -Wcast-qual
+            -Wconversion
+            -Wexit-time-destructors                            
+            -Wglobal-constructors
+            -Wmissing-noreturn
+            -Wmissing-prototypes
+            -Wno-missing-braces
+            -Wold-style-cast
+            -Wshadow
+            -Wweak-vtables
+            -Werror
+            -Wall
+            $<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,8.0.0>:-Wextra-semi-stmt>
+        >
+        
+        # GCC
+        $<$<C_COMPILER_ID:GNU>:
+            -Waddress
+            -Waggregate-return
+            -Wformat-nonliteral
+            -Wformat-security
+            -Wformat
+            -Winit-self
+            -Wmissing-declarations
+            -Wmissing-include-dirs
+            -Wno-multichar
+            -Wno-parentheses
+            -Wno-type-limits
+            -Wno-unused-parameter
+            -Wunreachable-code
+            -Wwrite-strings
+            -Wpointer-arith
+            -Werror
+            -Wall
+        >
+
+        # MSVC
+        $<$<C_COMPILER_ID:MSVC>:
+            /Wall
+        >
 )

 write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake
--- a/src/unity.c
+++ b/src/unity.c
@@ -19,9 +19,9 @@ void UNITY_OUTPUT_CHAR(int);
 #endif

 /* Helpful macros for us to use here in Assert functions */
-#define UNITY_FAIL_AND_BAIL   { Unity.CurrentTestFailed  = 1; UNITY_OUTPUT_FLUSH(); TEST_ABORT(); }
-#define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; UNITY_OUTPUT_FLUSH(); TEST_ABORT(); }
-#define RETURN_IF_FAIL_OR_IGNORE if (Unity.CurrentTestFailed || Unity.CurrentTestIgnored) TEST_ABORT()
+#define UNITY_FAIL_AND_BAIL         do { Unity.CurrentTestFailed  = 1; UNITY_OUTPUT_FLUSH(); TEST_ABORT(); } while (0)
+#define UNITY_IGNORE_AND_BAIL       do { Unity.CurrentTestIgnored = 1; UNITY_OUTPUT_FLUSH(); TEST_ABORT(); } while (0)
+#define RETURN_IF_FAIL_OR_IGNORE    do { if (Unity.CurrentTestFailed || Unity.CurrentTestIgnored) { TEST_ABORT(); } } while (0)

 struct UNITY_STORAGE_T Unity;

@@ -369,10 +369,12 @@ void UnityPrintFloat(const UNITY_DOUBLE input_number)
    }
    else
    {
-        UNITY_INT32 n_int = 0, n;
-        int exponent = 0;
-        int decimals, digits;
-        char buf[16] = {0};
+        UNITY_INT32 n_int = 0;
+        UNITY_INT32 n;
+        int         exponent = 0;
+        int         decimals;
+        int         digits;
+        char        buf[16] = {0};

        /*
         * Scale up or down by powers of 10.  To minimize rounding error,
@@ -450,9 +452,14 @@ void UnityPrintFloat(const UNITY_DOUBLE input_number)
            buf[digits++] = (char)('0' + n % 10);
            n /= 10;
        }
+
+        /* print out buffer (backwards) */
        while (digits > 0)
        {
-            if (digits == decimals) { UNITY_OUTPUT_CHAR('.'); }
+            if (digits == decimals)
+            {
+                UNITY_OUTPUT_CHAR('.');
+            }
            UNITY_OUTPUT_CHAR(buf[--digits]);
        }

@@ -765,11 +772,12 @@ void UnityAssertGreaterOrLessOrEqualNumber(const UNITY_INT threshold,
 }

 #define UnityPrintPointlessAndBail()       \
-{                                          \
+do {                                       \
    UnityTestResultsFailBegin(lineNumber); \
    UnityPrint(UnityStrPointless);         \
    UnityAddMsgIfSpecified(msg);           \
-    UNITY_FAIL_AND_BAIL; }
+    UNITY_FAIL_AND_BAIL;                   \
+} while (0)

 /*-----------------------------------------------*/
 void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
@@ -884,11 +892,12 @@ void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,

 #ifndef UNITY_EXCLUDE_FLOAT_PRINT
  #define UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual) \
-  {                                                               \
+  do {                                                            \
    UnityPrint(UnityStrExpected);                                 \
    UnityPrintFloat(expected);                                    \
    UnityPrint(UnityStrWas);                                      \
-    UnityPrintFloat(actual); }
+    UnityPrintFloat(actual);                                      \
+  } while (0)
 #else
  #define UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual) \
    UnityPrint(UnityStrDelta)
--- a/src/unity.h
+++ b/src/unity.h
@@ -111,7 +111,7 @@ void verifyTest(void);
 /* It is not necessary for you to call PASS. A PASS condition is assumed if nothing fails.
 * This method allows you to abort a test immediately with a PASS state, ignoring the remainder of the test. */
 #define TEST_PASS()                                                                                TEST_ABORT()
-#define TEST_PASS_MESSAGE(message)                                                                 do { UnityMessage((message), __LINE__); TEST_ABORT(); } while(0)
+#define TEST_PASS_MESSAGE(message)                                                                 do { UnityMessage((message), __LINE__); TEST_ABORT(); } while (0)

 /* This macro does nothing, but it is useful for build tools (like Ceedling) to make use of this to figure out
 * which files should be linked to in order to perform a test. Use it like TEST_FILE("sandwiches.c") */
--- a/src/unity_internals.h
+++ b/src/unity_internals.h
@@ -287,10 +287,10 @@ typedef UNITY_FLOAT_TYPE UNITY_FLOAT;
  #ifdef UNITY_USE_FLUSH_STDOUT
    /* We want to use the stdout flush utility */
    #include <stdio.h>
-    #define UNITY_OUTPUT_FLUSH() (void)fflush(stdout)
+    #define UNITY_OUTPUT_FLUSH()    (void)fflush(stdout)
  #else
    /* We've specified nothing, therefore flush should just be ignored */
-    #define UNITY_OUTPUT_FLUSH()
+    #define UNITY_OUTPUT_FLUSH()    (void)0
  #endif
 #else
  /* If defined as something else, make sure we declare it here so it's ready for use */
@@ -302,11 +302,11 @@ typedef UNITY_FLOAT_TYPE UNITY_FLOAT;
 #ifndef UNITY_OUTPUT_FLUSH
 #define UNITY_FLUSH_CALL()
 #else
-#define UNITY_FLUSH_CALL() UNITY_OUTPUT_FLUSH()
+#define UNITY_FLUSH_CALL()  UNITY_OUTPUT_FLUSH()
 #endif

 #ifndef UNITY_PRINT_EOL
-#define UNITY_PRINT_EOL()    UNITY_OUTPUT_CHAR('\n')
+#define UNITY_PRINT_EOL()   UNITY_OUTPUT_CHAR('\n')
 #endif

 #ifndef UNITY_OUTPUT_START
@@ -365,19 +365,19 @@ typedef UNITY_FLOAT_TYPE UNITY_FLOAT;
 #endif

 #ifndef UNITY_EXEC_TIME_START
-#define UNITY_EXEC_TIME_START() do{}while(0)
+#define UNITY_EXEC_TIME_START() do { /* nothing*/ } while (0)
 #endif

 #ifndef UNITY_EXEC_TIME_STOP
-#define UNITY_EXEC_TIME_STOP() do{}while(0)
+#define UNITY_EXEC_TIME_STOP()  do { /* nothing*/ } while (0)
 #endif

 #ifndef UNITY_TIME_TYPE
-#define UNITY_TIME_TYPE UNITY_UINT
+#define UNITY_TIME_TYPE         UNITY_UINT
 #endif

 #ifndef UNITY_PRINT_EXEC_TIME
-#define UNITY_PRINT_EXEC_TIME() do{}while(0)
+#define UNITY_PRINT_EXEC_TIME() do { /* nothing*/ } while (0)
 #endif

 /*-------------------------------------------------------
@@ -516,9 +516,9 @@ void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int
 #define UNITY_SET_DETAIL(d1)
 #define UNITY_SET_DETAILS(d1,d2)
 #else
-#define UNITY_CLR_DETAILS()      { Unity.CurrentDetail1 = 0;   Unity.CurrentDetail2 = 0;  }
-#define UNITY_SET_DETAIL(d1)     { Unity.CurrentDetail1 = (d1);  Unity.CurrentDetail2 = 0;  }
-#define UNITY_SET_DETAILS(d1,d2) { Unity.CurrentDetail1 = (d1);  Unity.CurrentDetail2 = (d2); }
+#define UNITY_CLR_DETAILS()         do { Unity.CurrentDetail1 = 0;     Unity.CurrentDetail2 = 0;    } while (0)
+#define UNITY_SET_DETAIL(d1)        do { Unity.CurrentDetail1 = (d1);  Unity.CurrentDetail2 = 0;    } while (0)
+#define UNITY_SET_DETAILS(d1,d2)    do { Unity.CurrentDetail1 = (d1);  Unity.CurrentDetail2 = (d2); } while (0)

 #ifndef UNITY_DETAIL1_NAME
 #define UNITY_DETAIL1_NAME "Function"
@@ -786,7 +786,7 @@ int UnityTestMatches(void);
 * Test Asserts
 *-------------------------------------------------------*/

-#define UNITY_TEST_ASSERT(condition, line, message)                                              do {if (condition) {} else {UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), (message));}} while(0)
+#define UNITY_TEST_ASSERT(condition, line, message)                                              do { if (condition) { /* nothing*/ } else { UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), (message)); } } while (0)
 #define UNITY_TEST_ASSERT_NULL(pointer, line, message)                                           UNITY_TEST_ASSERT(((pointer) == NULL),  (UNITY_LINE_TYPE)(line), (message))
 #define UNITY_TEST_ASSERT_NOT_NULL(pointer, line, message)                                       UNITY_TEST_ASSERT(((pointer) != NULL),  (UNITY_LINE_TYPE)(line), (message))
 #define UNITY_TEST_ASSERT_EMPTY(pointer, line, message)                                          UNITY_TEST_ASSERT(((pointer[0]) == 0),  (UNITY_LINE_TYPE)(line), (message))