encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed format string faults in audio tests. 

They were found by the recent code annotations.
This commit is contained in:
Philipp Wiesemann 2014-06-09 17:25:03 +02:00
parent 7467e30b83
commit ea93820e1f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/testautomation_audio.c
View File

@ -412,7 +412,7 @@ int audio_buildAudioCVT()
i, _audioFormatsVerbose[i], spec1.format, j, spec1.channels, k, spec1.freq, ii, _audioFormatsVerbose[ii], spec2.format, jj, spec2.channels, kk, spec2.freq); i, _audioFormatsVerbose[i], spec1.format, j, spec1.channels, k, spec1.freq, ii, _audioFormatsVerbose[ii], spec2.format, jj, spec2.channels, kk, spec2.freq);
SDLTest_AssertCheck(result == 0 || result == 1, "Verify result value; expected: 0 or 1, got: %i", result); SDLTest_AssertCheck(result == 0 || result == 1, "Verify result value; expected: 0 or 1, got: %i", result);
if (result<0) { if (result<0) {
SDLTest_LogError(SDL_GetError()); SDLTest_LogError("%s", SDL_GetError());
} else { } else {
SDLTest_AssertCheck(cvt.len_mult > 0, "Verify that cvt.len_mult value; expected: >0, got: %i", cvt.len_mult); SDLTest_AssertCheck(cvt.len_mult > 0, "Verify that cvt.len_mult value; expected: >0, got: %i", cvt.len_mult);
} }
@ -502,7 +502,7 @@ int audio_buildAudioCVTNegative()
SDL_strlcat(message, " spec2.freq", 256); SDL_strlcat(message, " spec2.freq", 256);
spec2.freq = 0; spec2.freq = 0;
} }
SDLTest_Log(message); SDLTest_Log("%s", message);
result = SDL_BuildAudioCVT(&cvt, spec1.format, spec1.channels, spec1.freq, result = SDL_BuildAudioCVT(&cvt, spec1.format, spec1.channels, spec1.freq,
spec2.format, spec2.channels, spec2.freq); spec2.format, spec2.channels, spec2.freq);
SDLTest_AssertPass("Call to SDL_BuildAudioCVT(spec1 ==> spec2)"); SDLTest_AssertPass("Call to SDL_BuildAudioCVT(spec1 ==> spec2)");
@ -688,7 +688,7 @@ int audio_convertAudio()
if (c & 4) { if (c & 4) {
SDL_strlcat(message, " Frequencies", 128); SDL_strlcat(message, " Frequencies", 128);
} }
SDLTest_Log(message); SDLTest_Log("%s", message);
/* All source conversions with random conversion targets */ /* All source conversions with random conversion targets */
for (i = 0; i < _numAudioFormats; i++) { for (i = 0; i < _numAudioFormats; i++) {
for (j = 0; j < _numAudioChannels; j++) { for (j = 0; j < _numAudioChannels; j++) {
@ -725,7 +725,7 @@ int audio_convertAudio()
i, _audioFormatsVerbose[i], spec1.format, j, spec1.channels, k, spec1.freq, ii, _audioFormatsVerbose[ii], spec2.format, jj, spec2.channels, kk, spec2.freq); i, _audioFormatsVerbose[i], spec1.format, j, spec1.channels, k, spec1.freq, ii, _audioFormatsVerbose[ii], spec2.format, jj, spec2.channels, kk, spec2.freq);
SDLTest_AssertCheck(result == 1, "Verify result value; expected: 1, got: %i", result); SDLTest_AssertCheck(result == 1, "Verify result value; expected: 1, got: %i", result);
if (result != 1) { if (result != 1) {
SDLTest_LogError(SDL_GetError()); SDLTest_LogError("%s", SDL_GetError());
} else { } else {
SDLTest_AssertCheck(cvt.len_mult > 0, "Verify that cvt.len_mult value; expected: >0, got: %i", cvt.len_mult); SDLTest_AssertCheck(cvt.len_mult > 0, "Verify that cvt.len_mult value; expected: >0, got: %i", cvt.len_mult);
if (cvt.len_mult < 1) return TEST_ABORTED; if (cvt.len_mult < 1) return TEST_ABORTED;