geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio: Code defensively to placate static analyzers, don't disabling warnings.

main
Ryan C. Gordon 2024-04-15 23:53:56 -04:00
parent bdd47f7770
commit 12b371679f
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/audio/SDL_audio.c
View File

@ -1811,7 +1811,8 @@ int SDL_BindAudioStreams(SDL_AudioDeviceID devid, SDL_AudioStream **streams, int
for (int i = 0; i < num_streams; i++) { for (int i = 0; i < num_streams; i++) {
SDL_AudioStream *stream = streams[i]; SDL_AudioStream *stream = streams[i];
if (!stream) { if (!stream) {
retval = SDL_SetError("Stream #%d is NULL", i); SDL_SetError("Stream #%d is NULL", i);
retval = -1; // to pacify the static analyzer, that doesn't realize SDL_SetError() always returns -1.
} else { } else {
SDL_LockMutex(stream->lock); SDL_LockMutex(stream->lock);
SDL_assert((stream->bound_device == NULL) == ((stream->prev_binding == NULL) || (stream->next_binding == NULL))); SDL_assert((stream->bound_device == NULL) == ((stream->prev_binding == NULL) || (stream->next_binding == NULL)));
@ -1839,31 +1840,25 @@ int SDL_BindAudioStreams(SDL_AudioDeviceID devid, SDL_AudioStream **streams, int
// Now that everything is verified, chain everything together. // Now that everything is verified, chain everything together.
const SDL_bool iscapture = device->iscapture; const SDL_bool iscapture = device->iscapture;
for (int i = 0; i < num_streams; i++) { for (int i = 0; i < num_streams; i++) {
#ifdef _MSC_VER /* Visual Studio analyzer can't tell that streams[i] isn't NULL if retval is 0 */
#pragma warning(push)
#pragma warning(disable : 28182)
#endif
SDL_AudioStream *stream = streams[i]; SDL_AudioStream *stream = streams[i];
if (stream) { // shouldn't be NULL, but just in case...
stream->bound_device = logdev; stream->bound_device = logdev;
stream->prev_binding = NULL; stream->prev_binding = NULL;
stream->next_binding = logdev->bound_streams; stream->next_binding = logdev->bound_streams;
if (logdev->bound_streams) { if (logdev->bound_streams) {
logdev->bound_streams->prev_binding = stream; logdev->bound_streams->prev_binding = stream;
}
logdev->bound_streams = stream;
if (iscapture) {
SDL_copyp(&stream->src_spec, &device->spec);
if (logdev->postmix) {
stream->src_spec.format = SDL_AUDIO_F32;
} }
} logdev->bound_streams = stream;
SDL_UnlockMutex(stream->lock); if (iscapture) {
#ifdef _MSC_VER SDL_copyp(&stream->src_spec, &device->spec);
#pragma warning(pop) if (logdev->postmix) {
#endif stream->src_spec.format = SDL_AUDIO_F32;
}
}
SDL_UnlockMutex(stream->lock);
}
} }
} }