We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch that fixes warnings

fmt-spec-warn.patch (text/plain), 5.71 KB, created by Jay Petacat on 2020-03-25 05:39:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jay Petacat

Created: 2020-03-25 05:39:27 UTC

Size: 5.71 KB

patch

obsolete

># HG changeset patch
># User Jay Petacat <jay@jayschwa.net>
># Date 1585114455 14400
>#      Wed Mar 25 01:34:15 2020 -0400
># Branch fmt-spec-warn
># Node ID d5f9f3367c21e963b77d070be8ea9709b130dbc2
># Parent  769f800952179633ec6c3e6bc1bc1d40e401750a
>Fix some format specifier warnings
>
>The warnings were produced by GCC 9.2.x for x86_64-linux-gnu or
>i386-pc-msdosdjgpp targets.
>
>Most of the fixes involve changing the type of a variable rather than
>the format specifier. For many of the affected test conuter variables,
>a basic int seems sufficient.
>
>Some format specifier warnings still remain for cases where changing
>type or casting seemed inappropriate. Those warnings will probably
>require some new format specifier macros (e.g. SDL_PRIu32).
>
>diff -r 769f80095217 -r d5f9f3367c21 src/test/SDL_test_assert.c
>--- a/src/test/SDL_test_assert.c	Tue Mar 24 10:05:51 2020 -0700
>+++ b/src/test/SDL_test_assert.c	Wed Mar 25 01:34:15 2020 -0400
>@@ -36,10 +36,10 @@
> #define SDLTEST_ASSERT_SUMMARY_FORMAT "Assert Summary: Total=%d Passed=%d Failed=%d"
> 
> /* ! \brief counts the failed asserts */
>-static Uint32 SDLTest_AssertsFailed = 0;
>+static int SDLTest_AssertsFailed = 0;
> 
> /* ! \brief counts the passed asserts */
>-static Uint32 SDLTest_AssertsPassed = 0;
>+static int SDLTest_AssertsPassed = 0;
> 
> /*
>  *  Assert that logs and break execution flow on failures (i.e. for harness errors).
>@@ -122,7 +122,7 @@
>  */
> void SDLTest_LogAssertSummary()
> {
>-    Uint32 totalAsserts = SDLTest_AssertsPassed + SDLTest_AssertsFailed;
>+    int totalAsserts = SDLTest_AssertsPassed + SDLTest_AssertsFailed;
>     if (SDLTest_AssertsFailed == 0)
>     {
>         SDLTest_Log(SDLTEST_ASSERT_SUMMARY_FORMAT, totalAsserts, SDLTest_AssertsPassed, SDLTest_AssertsFailed);
>diff -r 769f80095217 -r d5f9f3367c21 src/test/SDL_test_harness.c
>--- a/src/test/SDL_test_harness.c	Tue Mar 24 10:05:51 2020 -0700
>+++ b/src/test/SDL_test_harness.c	Wed Mar 25 01:34:15 2020 -0400
>@@ -394,13 +394,13 @@
> 	SDL_bool forceTestRun = SDL_FALSE;
>     int testResult = 0;
>     int runResult = 0;
>-    Uint32 totalTestFailedCount = 0;
>-    Uint32 totalTestPassedCount = 0;
>-    Uint32 totalTestSkippedCount = 0;
>-    Uint32 testFailedCount = 0;
>-    Uint32 testPassedCount = 0;
>-    Uint32 testSkippedCount = 0;
>-    Uint32 countSum = 0;
>+    int totalTestFailedCount = 0;
>+    int totalTestPassedCount = 0;
>+    int totalTestSkippedCount = 0;
>+    int testFailedCount = 0;
>+    int testPassedCount = 0;
>+    int testSkippedCount = 0;
>+    int countSum = 0;
>     const SDLTest_TestCaseReference **failedTests;
> 
>     /* Sanitize test iterations */
>diff -r 769f80095217 -r d5f9f3367c21 test/testautomation.c
>--- a/test/testautomation.c	Tue Mar 24 10:05:51 2020 -0700
>+++ b/test/testautomation.c	Wed Mar 25 01:34:15 2020 -0400
>@@ -62,7 +62,7 @@
>             }
>             else if (SDL_strcasecmp(argv[i], "--execKey") == 0) {
>                 if (argv[i + 1]) {
>-                    SDL_sscanf(argv[i + 1], "%"SDL_PRIu64, (long long unsigned int *)&userExecKey);
>+                    SDL_sscanf(argv[i + 1], "%"SDL_PRIu64, &userExecKey);
>                     consumed = 2;
>                 }
>             }
>diff -r 769f80095217 -r d5f9f3367c21 test/testautomation_sdltest.c
>--- a/test/testautomation_sdltest.c	Tue Mar 24 10:05:51 2020 -0700
>+++ b/test/testautomation_sdltest.c	Wed Mar 25 01:34:15 2020 -0400
>@@ -1163,7 +1163,7 @@
> 
>   targetLen = 16 + SDLTest_RandomUint8();
>   result = SDLTest_RandomAsciiStringWithMaximumLength((int) targetLen);
>-  SDLTest_AssertPass("Call to SDLTest_RandomAsciiStringWithMaximumLength(%d)", targetLen);
>+  SDLTest_AssertPass("Call to SDLTest_RandomAsciiStringWithMaximumLength(%d)", (int) targetLen);
>   SDLTest_AssertCheck(result != NULL, "Validate that result is not NULL");
>   if (result != NULL) {
>      len = SDL_strlen(result);
>@@ -1184,7 +1184,7 @@
>   /* Negative test */
>   targetLen = 0;
>   result = SDLTest_RandomAsciiStringWithMaximumLength((int) targetLen);
>-  SDLTest_AssertPass("Call to SDLTest_RandomAsciiStringWithMaximumLength(%d)", targetLen);
>+  SDLTest_AssertPass("Call to SDLTest_RandomAsciiStringWithMaximumLength(%d)", (int) targetLen);
>   SDLTest_AssertCheck(result == NULL, "Validate that result is NULL");
>   lastError = (char *)SDL_GetError();
>   SDLTest_AssertPass("SDL_GetError()");
>@@ -1217,7 +1217,7 @@
>   /* Positive test */
>   targetLen = 16 + SDLTest_RandomUint8();
>   result = SDLTest_RandomAsciiStringOfSize((int) targetLen);
>-  SDLTest_AssertPass("Call to SDLTest_RandomAsciiStringOfSize(%d)", targetLen);
>+  SDLTest_AssertPass("Call to SDLTest_RandomAsciiStringOfSize(%d)", (int) targetLen);
>   SDLTest_AssertCheck(result != NULL, "Validate that result is not NULL");
>   if (result != NULL) {
>      len = SDL_strlen(result);
>@@ -1238,7 +1238,7 @@
>   /* Negative test */
>   targetLen = 0;
>   result = SDLTest_RandomAsciiStringOfSize((int) targetLen);
>-  SDLTest_AssertPass("Call to SDLTest_RandomAsciiStringOfSize(%d)", targetLen);
>+  SDLTest_AssertPass("Call to SDLTest_RandomAsciiStringOfSize(%d)", (int) targetLen);
>   SDLTest_AssertCheck(result == NULL, "Validate that result is NULL");
>   lastError = (char *)SDL_GetError();
>   SDLTest_AssertPass("SDL_GetError()");
>diff -r 769f80095217 -r d5f9f3367c21 test/testtimer.c
>--- a/test/testtimer.c	Tue Mar 24 10:05:51 2020 -0700
>+++ b/test/testtimer.c	Wed Mar 25 01:34:15 2020 -0400
>@@ -107,7 +107,7 @@
>     now = SDL_GetPerformanceCounter();
>     SDL_Log("1 million iterations of ticktock took %f ms\n", (double)((now - start)*1000) / SDL_GetPerformanceFrequency());
> 
>-    SDL_Log("Performance counter frequency: %"SDL_PRIu64"\n", (unsigned long long) SDL_GetPerformanceFrequency());
>+    SDL_Log("Performance counter frequency: %"SDL_PRIu64"\n", SDL_GetPerformanceFrequency());
>     start32 = SDL_GetTicks();
>     start = SDL_GetPerformanceCounter();
>     SDL_Delay(1000);

Actions: View | Diff

Attachments on bug 5059: 4279

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.