From 8dffcd8c2ab163673b6a9e98af2e2dd30f233a94 Mon Sep 17 00:00:00 2001 From: Sergey Gusarov Date: Sun, 2 Nov 2014 07:08:48 +0400 Subject: [PATCH 1/2] =?UTF-8?q?Fixed=20a=20lot=20of=20single-type=20gcc=20?= =?UTF-8?q?warning:=20warning:=20cast=20discards=20=E2=80=98=5F=5Fattribut?= =?UTF-8?q?e=5F=5F((const))=E2=80=99=20qualifier=20from=20pointer=20target?= =?UTF-8?q?=20type=20[-Wcast-qual]=20FYI,=20"-Wcast-qual"=20is=20not=20a?= =?UTF-8?q?=20default=20option.=20The=20main=20idea:=20If=20some=20functio?= =?UTF-8?q?n=20receives=20"const=20void*"=20why=20should=20it=20operate=20?= =?UTF-8?q?with=20"void*"=20(or=20something)=20afterwards=20(after=20casti?= =?UTF-8?q?ng)=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/unity.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/unity.c b/src/unity.c index ef7d4c2..501e7e5 100644 --- a/src/unity.c +++ b/src/unity.c @@ -425,8 +425,8 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected, const UNITY_DISPLAY_STYLE_T style) { _UU32 elements = num_elements; - UNITY_PTR_ATTRIBUTE const _US8* ptr_exp = (UNITY_PTR_ATTRIBUTE _US8*)expected; - UNITY_PTR_ATTRIBUTE const _US8* ptr_act = (UNITY_PTR_ATTRIBUTE _US8*)actual; + UNITY_PTR_ATTRIBUTE const _US8* ptr_exp = (UNITY_PTR_ATTRIBUTE const _US8*)expected; + UNITY_PTR_ATTRIBUTE const _US8* ptr_act = (UNITY_PTR_ATTRIBUTE const _US8*)actual; UNITY_SKIP_EXECUTION; @@ -438,7 +438,7 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected, UNITY_FAIL_AND_BAIL; } - if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1) + if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE const void*)expected, (UNITY_PTR_ATTRIBUTE const void*)actual, lineNumber, msg) == 1) return; // If style is UNITY_DISPLAY_STYLE_INT, we'll fall into the default case rather than the INT16 or INT32 (etc) case @@ -556,7 +556,7 @@ void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const _UF* expected, UNITY_FAIL_AND_BAIL; } - if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1) + if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE const void*)expected, (UNITY_PTR_ATTRIBUTE const void*)actual, lineNumber, msg) == 1) return; while (elements--) @@ -999,8 +999,8 @@ void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected, const char* msg, const UNITY_LINE_TYPE lineNumber) { - UNITY_PTR_ATTRIBUTE unsigned char* ptr_exp = (UNITY_PTR_ATTRIBUTE unsigned char*)expected; - UNITY_PTR_ATTRIBUTE unsigned char* ptr_act = (UNITY_PTR_ATTRIBUTE unsigned char*)actual; + UNITY_PTR_ATTRIBUTE const unsigned char* ptr_exp = (UNITY_PTR_ATTRIBUTE const unsigned char*)expected; + UNITY_PTR_ATTRIBUTE const unsigned char* ptr_act = (UNITY_PTR_ATTRIBUTE const unsigned char*)actual; _UU32 elements = num_elements; _UU32 bytes; @@ -1014,7 +1014,7 @@ void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected, UNITY_FAIL_AND_BAIL; } - if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1) + if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE const void*)expected, (UNITY_PTR_ATTRIBUTE const void*)actual, lineNumber, msg) == 1) return; while (elements--) From b492b6d379363e0b62846e166506eb70bb7710b5 Mon Sep 17 00:00:00 2001 From: Sergey Gusarov Date: Sun, 2 Nov 2014 07:19:34 +0400 Subject: [PATCH 2/2] Yet another fixes portion for "-Wcast-qual" warning. But they look a bit different. --- src/unity.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/unity.c b/src/unity.c index 501e7e5..f188d68 100644 --- a/src/unity.c +++ b/src/unity.c @@ -472,15 +472,15 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected, case UNITY_DISPLAY_STYLE_UINT16: while (elements--) { - if (*(UNITY_PTR_ATTRIBUTE _US16*)ptr_exp != *(UNITY_PTR_ATTRIBUTE _US16*)ptr_act) + if (*(UNITY_PTR_ATTRIBUTE const _US16*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US16*)ptr_act) { UnityTestResultsFailBegin(lineNumber); UnityPrint(UnityStrElement); UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US16*)ptr_exp, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)ptr_exp, style); UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US16*)ptr_act, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)ptr_act, style); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } @@ -494,15 +494,15 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected, case UNITY_DISPLAY_STYLE_UINT64: while (elements--) { - if (*(UNITY_PTR_ATTRIBUTE _US64*)ptr_exp != *(UNITY_PTR_ATTRIBUTE _US64*)ptr_act) + if (*(UNITY_PTR_ATTRIBUTE const _US64*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US64*)ptr_act) { UnityTestResultsFailBegin(lineNumber); UnityPrint(UnityStrElement); UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US64*)ptr_exp, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)ptr_exp, style); UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US64*)ptr_act, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)ptr_act, style); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } @@ -514,15 +514,15 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected, default: while (elements--) { - if (*(UNITY_PTR_ATTRIBUTE _US32*)ptr_exp != *(UNITY_PTR_ATTRIBUTE _US32*)ptr_act) + if (*(UNITY_PTR_ATTRIBUTE const _US32*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US32*)ptr_act) { UnityTestResultsFailBegin(lineNumber); UnityPrint(UnityStrElement); UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US32*)ptr_exp, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)ptr_exp, style); UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US32*)ptr_act, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)ptr_act, style); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; }