Commit 1f716769062093a30caea607cf1876de6e3527d3
2014-06-05T15:29:23
Fix warnings, only major one being an SDL_SetError not providing enough arguments.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
index 8daa8c6..5487f2d 100644
--- a/src/audio/SDL_wave.c
+++ b/src/audio/SDL_wave.c
@@ -343,7 +343,7 @@ IMA_ADPCM_decode(Uint8 ** audio_buf, Uint32 * audio_len)
/* Check to make sure we have enough variables in the state array */
channels = IMA_ADPCM_state.wavefmt.channels;
if (channels > SDL_arraysize(IMA_ADPCM_state.state)) {
- SDL_SetError("IMA ADPCM decoder can only handle %d channels",
+ SDL_SetError("IMA ADPCM decoder can only handle %zu channels",
SDL_arraysize(IMA_ADPCM_state.state));
return (-1);
}
diff --git a/src/filesystem/unix/SDL_sysfilesystem.c b/src/filesystem/unix/SDL_sysfilesystem.c
index 0349476..cd11a67 100644
--- a/src/filesystem/unix/SDL_sysfilesystem.c
+++ b/src/filesystem/unix/SDL_sysfilesystem.c
@@ -197,7 +197,7 @@ SDL_GetPrefPath(const char *org, const char *app)
}
if (mkdir(retval, 0700) != 0 && errno != EEXIST) {
error:
- SDL_SetError("Couldn't create directory '%s': ", retval, strerror(errno));
+ SDL_SetError("Couldn't create directory '%s': '%s'", retval, strerror(errno));
SDL_free(retval);
return NULL;
}
diff --git a/src/test/SDL_test_harness.c b/src/test/SDL_test_harness.c
index 93f8dd7..74e898e 100644
--- a/src/test/SDL_test_harness.c
+++ b/src/test/SDL_test_harness.c
@@ -564,7 +564,7 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user
execKey = SDLTest_GenerateExecKey((char *)runSeed, testSuite->name, testCase->name, iterationCounter);
}
- SDLTest_Log("Test Iteration %i: execKey %llu", iterationCounter, execKey);
+ SDLTest_Log("Test Iteration %i: execKey %" PRIu64 "", iterationCounter, execKey);
testResult = SDLTest_RunTest(testSuite, testCase, execKey);
if (testResult == TEST_RESULT_PASSED) {
diff --git a/src/thread/pthread/SDL_syssem.c b/src/thread/pthread/SDL_syssem.c
index 358baff..6d84e1b 100644
--- a/src/thread/pthread/SDL_syssem.c
+++ b/src/thread/pthread/SDL_syssem.c
@@ -150,7 +150,7 @@ SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
if (errno == ETIMEDOUT) {
retval = SDL_MUTEX_TIMEDOUT;
} else {
- SDL_SetError(strerror(errno));
+ SDL_SetError("sem_timedwait returned an error: %s", strerror(errno));
}
}
#else