gallant/SDL2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Christoph Mallon: Remove pointless if (x) before SDL_free(x)

Browse source
This commit is contained in:
Sam Lantinga 2013-08-29 08:29:21 -07:00
parent 3f1c70c044
commit f7fda2b389
63 changed files with 157 additions and 349 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/SDL_hints.c
View file

@ -72,9 +72,7 @@ SDL_SetHintWithPriority(const char *name, const char *value,
entry->callback(entry->userdata, name, hint->value, value);
entry = next;
}
if (hint->value) {
SDL_free(hint->value);
}
SDL_free(hint->value);
hint->value = value ? SDL_strdup(value) : NULL;
}
hint->priority = priority;
@ -206,9 +204,7 @@ void SDL_ClearHints(void)
SDL_hints = hint->next;
SDL_free(hint->name);
if (hint->value) {
SDL_free(hint->value);
}
SDL_free(hint->value);
for (entry = hint->callbacks; entry; ) {
SDL_HintWatch *freeable = entry;
entry = entry->next;

12
src/audio/SDL_audio.c
View file

@ -300,9 +300,7 @@ SDL_StreamInit(SDL_AudioStreamer * stream, int max_len, Uint8 silence)
static void
SDL_StreamDeinit(SDL_AudioStreamer * stream)
{
if (stream->buffer != NULL) {
SDL_free(stream->buffer);
}
SDL_free(stream->buffer);
}
#if defined(ANDROID)
@ -632,9 +630,7 @@ free_device_list(char ***devices, int *devCount)
}
}
if (*devices != NULL) {
SDL_free(*devices);
}
SDL_free(*devices);
*devices = NULL;
*devCount = 0;
@ -761,9 +757,7 @@ close_audio_device(SDL_AudioDevice * device)
if (device->mixer_lock != NULL) {
SDL_DestroyMutex(device->mixer_lock);
}
if (device->fake_stream != NULL) {
SDL_FreeAudioMem(device->fake_stream);
}
SDL_FreeAudioMem(device->fake_stream);
if (device->convert.needed) {
SDL_FreeAudioMem(device->convert.buf);
}

20
src/audio/SDL_wave.c
View file

@ -449,10 +449,8 @@ SDL_LoadWAV_RW(SDL_RWops * src, int freesrc,
/* Read the audio data format chunk */
chunk.data = NULL;
do {
if (chunk.data != NULL) {
SDL_free(chunk.data);
chunk.data = NULL;
}
SDL_free(chunk.data);
chunk.data = NULL;
lenread = ReadChunk(src, &chunk);
if (lenread < 0) {
was_error = 1;
@ -549,10 +547,8 @@ SDL_LoadWAV_RW(SDL_RWops * src, int freesrc,
/* Read the audio data chunk */
*audio_buf = NULL;
do {
if (*audio_buf != NULL) {
SDL_free(*audio_buf);
*audio_buf = NULL;
}
SDL_free(*audio_buf);
*audio_buf = NULL;
lenread = ReadChunk(src, &chunk);
if (lenread < 0) {
was_error = 1;
@ -583,9 +579,7 @@ SDL_LoadWAV_RW(SDL_RWops * src, int freesrc,
*audio_len &= ~(samplesize - 1);
done:
if (format != NULL) {
SDL_free(format);
}
SDL_free(format);
if (src) {
if (freesrc) {
SDL_RWclose(src);
@ -606,9 +600,7 @@ SDL_LoadWAV_RW(SDL_RWops * src, int freesrc,
void
SDL_FreeWAV(Uint8 * audio_buf)
{
if (audio_buf != NULL) {
SDL_free(audio_buf);
}
SDL_free(audio_buf);
}
static int

6
src/audio/alsa/SDL_alsa_audio.c
View file

@ -340,10 +340,8 @@ static void
ALSA_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
if (this->hidden->mixbuf != NULL) {
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
}
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
if (this->hidden->pcm_handle) {
ALSA_snd_pcm_drain(this->hidden->pcm_handle);
ALSA_snd_pcm_close(this->hidden->pcm_handle);

6
src/audio/arts/SDL_artsaudio.c
View file

@ -204,10 +204,8 @@ static void
ARTS_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
if (this->hidden->mixbuf != NULL) {
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
}
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
if (this->hidden->stream) {
SDL_NAME(arts_close_stream) (this->hidden->stream);
this->hidden->stream = 0;

6
src/audio/bsd/SDL_bsdaudio.c
View file

@ -214,10 +214,8 @@ static void
BSDAUDIO_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
if (this->hidden->mixbuf != NULL) {
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
}
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
if (this->hidden->audio_fd >= 0) {
close(this->hidden->audio_fd);
this->hidden->audio_fd = -1;

6
src/audio/disk/SDL_diskaudio.c
View file

@ -88,10 +88,8 @@ static void
DISKAUD_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
if (this->hidden->mixbuf != NULL) {
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
}
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
if (this->hidden->output != NULL) {
SDL_RWclose(this->hidden->output);
this->hidden->output = NULL;

6
src/audio/dsp/SDL_dspaudio.c
View file

@ -61,10 +61,8 @@ static void
DSP_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
if (this->hidden->mixbuf != NULL) {
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
}
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
if (this->hidden->audio_fd >= 0) {
close(this->hidden->audio_fd);
this->hidden->audio_fd = -1;

6
src/audio/esd/SDL_esdaudio.c
View file

@ -176,10 +176,8 @@ static void
ESD_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
if (this->hidden->mixbuf != NULL) {
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
}
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
if (this->hidden->audio_fd >= 0) {
SDL_NAME(esd_close) (this->hidden->audio_fd);
this->hidden->audio_fd = -1;

6
src/audio/fusionsound/SDL_fsaudio.c
View file

@ -169,10 +169,8 @@ static void
SDL_FS_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
if (this->hidden->mixbuf != NULL) {
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
}
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
if (this->hidden->stream) {
this->hidden->stream->Release(this->hidden->stream);
this->hidden->stream = NULL;

6
src/audio/nas/SDL_nasaudio.c
View file

@ -191,10 +191,8 @@ static void
NAS_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
if (this->hidden->mixbuf != NULL) {
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
}
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
if (this->hidden->aud) {
NAS_AuCloseServer(this->hidden->aud);
this->hidden->aud = 0;

6
src/audio/paudio/SDL_paudio.c
View file

@ -231,10 +231,8 @@ static void
PAUDIO_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
if (this->hidden->mixbuf != NULL) {
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
}
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
if (this->hidden->audio_fd >= 0) {
close(this->hidden->audio_fd);
this->hidden->audio_fd = -1;

6
src/audio/pulseaudio/SDL_pulseaudio.c
View file

@ -300,10 +300,8 @@ static void
PULSEAUDIO_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
if (this->hidden->mixbuf != NULL) {
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
}
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
if (this->hidden->stream) {
PULSEAUDIO_pa_stream_disconnect(this->hidden->stream);
PULSEAUDIO_pa_stream_unref(this->hidden->stream);

6
src/audio/qsa/SDL_qsa_audio.c
View file

@ -328,10 +328,8 @@ QSA_CloseDevice(_THIS)
this->hidden->audio_handle = NULL;
}
if (this->hidden->pcm_buf != NULL) {
SDL_FreeAudioMem(this->hidden->pcm_buf);
this->hidden->pcm_buf = NULL;
}
SDL_FreeAudioMem(this->hidden->pcm_buf);
this->hidden->pcm_buf = NULL;
SDL_free(this->hidden);
this->hidden = NULL;

6
src/audio/sndio/SDL_sndioaudio.c
View file

@ -181,10 +181,8 @@ static void
SNDIO_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
if (this->hidden->mixbuf != NULL) {
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
}
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
if ( this->hidden->dev != NULL ) {
SNDIO_sio_close(this->hidden->dev);
this->hidden->dev = NULL;

12
src/audio/sun/SDL_sunaudio.c
View file

@ -184,14 +184,10 @@ static void
SUNAUDIO_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
if (this->hidden->mixbuf != NULL) {
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
}
if (this->hidden->ulaw_buf != NULL) {
SDL_free(this->hidden->ulaw_buf);
this->hidden->ulaw_buf = NULL;
}
SDL_FreeAudioMem(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
SDL_free(this->hidden->ulaw_buf);
this->hidden->ulaw_buf = NULL;
if (this->hidden->audio_fd >= 0) {
close(this->hidden->audio_fd);
this->hidden->audio_fd = -1;

8
src/audio/winmm/SDL_winmm.c
View file

@ -176,11 +176,9 @@ WINMM_CloseDevice(_THIS)
}
}
if (this->hidden->mixbuf != NULL) {
/* Free raw mixing buffer */
SDL_free(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
}
/* Free raw mixing buffer */
SDL_free(this->hidden->mixbuf);
this->hidden->mixbuf = NULL;
if (this->hidden->hin) {
waveInClose(this->hidden->hin);

4
src/audio/xaudio2/SDL_xaudio2.c
View file

@ -205,9 +205,7 @@ XAUDIO2_CloseDevice(_THIS)
if (ixa2 != NULL) {
IXAudio2_Release(ixa2);
}
if (this->hidden->mixbuf != NULL) {
SDL_free(this->hidden->mixbuf);
}
SDL_free(this->hidden->mixbuf);
if (this->hidden->semaphore != NULL) {
CloseHandle(this->hidden->semaphore);
}

6
src/events/SDL_events.c
View file

@ -141,10 +141,8 @@ SDL_StopEventLoop(void)
/* Clear disabled event state */
for (i = 0; i < SDL_arraysize(SDL_disabled_events); ++i) {
if (SDL_disabled_events[i]) {
SDL_free(SDL_disabled_events[i]);
SDL_disabled_events[i] = NULL;
}
SDL_free(SDL_disabled_events[i]);
SDL_disabled_events[i] = NULL;
}
while (SDL_event_watchers) {

6
src/events/SDL_touch.c
View file

@ -355,10 +355,8 @@ SDL_TouchQuit(void)
}
SDL_assert(SDL_num_touch == 0);
if (SDL_touchDevices) {
SDL_free(SDL_touchDevices);
SDL_touchDevices = NULL;
}
SDL_free(SDL_touchDevices);
SDL_touchDevices = NULL;
}
/* vi: set ts=4 sw=4 expandtab: */

6
src/file/SDL_rwops.c
View file

@ -275,10 +275,8 @@ windows_file_close(SDL_RWops * context)
CloseHandle(context->hidden.windowsio.h);
context->hidden.windowsio.h = INVALID_HANDLE_VALUE; /* to be sure */
}
if (context->hidden.windowsio.buffer.data) {
SDL_free(context->hidden.windowsio.buffer.data);
context->hidden.windowsio.buffer.data = NULL;
}
SDL_free(context->hidden.windowsio.buffer.data);
context->hidden.windowsio.buffer.data = NULL;
SDL_FreeRW(context);
}
return (0);

4
src/filesystem/unix/SDL_sysfilesystem.c
View file

@ -69,9 +69,7 @@ readSymLink(const char *path)
len *= 2; /* grow buffer, try again. */
}
if (retval != NULL) {
SDL_free(retval);
}
SDL_free(retval);
return NULL;
}

6
src/haptic/SDL_haptic.c
View file

@ -379,10 +379,8 @@ void
SDL_HapticQuit(void)
{
SDL_SYS_HapticQuit();
if (SDL_haptics != NULL) {
SDL_free(SDL_haptics);
SDL_haptics = NULL;
}
SDL_free(SDL_haptics);
SDL_haptics = NULL;
SDL_numhaptics = 0;
}

24
src/haptic/darwin/SDL_syshaptic.c
View file

@ -943,14 +943,10 @@ SDL_SYS_HapticFreeFFEFFECT(FFEFFECT * effect, int type)
{
FFCUSTOMFORCE *custom;
if (effect->lpEnvelope != NULL) {
SDL_free(effect->lpEnvelope);
effect->lpEnvelope = NULL;
}
if (effect->rgdwAxes != NULL) {
SDL_free(effect->rgdwAxes);
effect->rgdwAxes = NULL;
}
SDL_free(effect->lpEnvelope);
effect->lpEnvelope = NULL;
SDL_free(effect->rgdwAxes);
effect->rgdwAxes = NULL;
if (effect->lpvTypeSpecificParams != NULL) {
if (type == SDL_HAPTIC_CUSTOM) { /* Must free the custom data. */
custom = (FFCUSTOMFORCE *) effect->lpvTypeSpecificParams;
@ -960,10 +956,8 @@ SDL_SYS_HapticFreeFFEFFECT(FFEFFECT * effect, int type)
SDL_free(effect->lpvTypeSpecificParams);
effect->lpvTypeSpecificParams = NULL;
}
if (effect->rglDirection != NULL) {
SDL_free(effect->rglDirection);
effect->rglDirection = NULL;
}
SDL_free(effect->rglDirection);
effect->rglDirection = NULL;
}
@ -1061,10 +1055,8 @@ SDL_SYS_HapticNewEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
err_effectdone:
SDL_SYS_HapticFreeFFEFFECT(&effect->hweffect->effect, base->type);
err_hweffect:
if (effect->hweffect != NULL) {
SDL_free(effect->hweffect);
effect->hweffect = NULL;
}
SDL_free(effect->hweffect);
effect->hweffect = NULL;
return -1;
}

30
src/haptic/windows/SDL_syshaptic.c
View file

@ -751,10 +751,8 @@ SDL_SYS_HapticQuit(void)
}
for (i = 0; i < SDL_arraysize(SDL_hapticlist); ++i) {
if (SDL_hapticlist[i].name) {
SDL_free(SDL_hapticlist[i].name);
SDL_hapticlist[i].name = NULL;
}
SDL_free(SDL_hapticlist[i].name);
SDL_hapticlist[i].name = NULL;
}
if (dinput != NULL) {
@ -1127,14 +1125,10 @@ SDL_SYS_HapticFreeDIEFFECT(DIEFFECT * effect, int type)
{
DICUSTOMFORCE *custom;
if (effect->lpEnvelope != NULL) {
SDL_free(effect->lpEnvelope);
effect->lpEnvelope = NULL;
}
if (effect->rgdwAxes != NULL) {
SDL_free(effect->rgdwAxes);
effect->rgdwAxes = NULL;
}
SDL_free(effect->lpEnvelope);
effect->lpEnvelope = NULL;
SDL_free(effect->rgdwAxes);
effect->rgdwAxes = NULL;
if (effect->lpvTypeSpecificParams != NULL) {
if (type == SDL_HAPTIC_CUSTOM) { /* Must free the custom data. */
custom = (DICUSTOMFORCE *) effect->lpvTypeSpecificParams;
@ -1144,10 +1138,8 @@ SDL_SYS_HapticFreeDIEFFECT(DIEFFECT * effect, int type)
SDL_free(effect->lpvTypeSpecificParams);
effect->lpvTypeSpecificParams = NULL;
}
if (effect->rglDirection != NULL) {
SDL_free(effect->rglDirection);
effect->rglDirection = NULL;
}
SDL_free(effect->rglDirection);
effect->rglDirection = NULL;
}
@ -1250,10 +1242,8 @@ SDL_SYS_HapticNewEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
err_effectdone:
SDL_SYS_HapticFreeDIEFFECT(&effect->hweffect->effect, base->type);
err_hweffect:
if (effect->hweffect != NULL) {
SDL_free(effect->hweffect);
effect->hweffect = NULL;
}
SDL_free(effect->hweffect);
effect->hweffect = NULL;
return -1;
}

19
src/joystick/SDL_joystick.c
View file

@ -437,22 +437,13 @@ SDL_JoystickClose(SDL_Joystick * joystick)
joysticklist = joysticklist->next;
}
if (joystick->name)
SDL_free(joystick->name);
SDL_free(joystick->name);
/* Free the data associated with this joystick */
if (joystick->axes) {
SDL_free(joystick->axes);
}
if (joystick->hats) {
SDL_free(joystick->hats);
}
if (joystick->balls) {
SDL_free(joystick->balls);
}
if (joystick->buttons) {
SDL_free(joystick->buttons);
}
SDL_free(joystick->axes);
SDL_free(joystick->hats);
SDL_free(joystick->balls);
SDL_free(joystick->buttons);
SDL_free(joystick);
}

8
src/joystick/beos/SDL_bejoystick.cc
View file

@ -231,12 +231,8 @@ extern "C"
if (joystick->hwdata) {
joystick->hwdata->stick->Close();
delete joystick->hwdata->stick;
if (joystick->hwdata->new_hats) {
SDL_free(joystick->hwdata->new_hats);
}
if (joystick->hwdata->new_axes) {
SDL_free(joystick->hwdata->new_axes);
}
SDL_free(joystick->hwdata->new_hats);
SDL_free(joystick->hwdata->new_axes);
SDL_free(joystick->hwdata);
joystick->hwdata = NULL;
}

10
src/joystick/bsd/SDL_sysjoystick.c
View file

@ -577,10 +577,8 @@ SDL_SYS_JoystickQuit(void)
int i;
for (i = 0; i < MAX_JOYS; i++) {
if (joynames[i] != NULL)
SDL_free(joynames[i]);
if (joydevnames[i] != NULL)
SDL_free(joydevnames[i]);
SDL_free(joynames[i]);
SDL_free(joydevnames[i]);
}
return;
@ -657,9 +655,7 @@ report_alloc(struct report *r, struct report_desc *rd, int repind)
static void
report_free(struct report *r)
{
if (r->buf != NULL) {
SDL_free(r->buf);
}
SDL_free(r->buf);
r->status = SREPORT_UNINIT;
}

8
src/joystick/windows/SDL_dxjoystick.c
View file

@ -834,7 +834,7 @@ void SDL_SYS_JoystickDetect()
pListNext = pCurList->pNext;
SDL_free(pCurList->joystickname);
SDL_free( pCurList );
SDL_free(pCurList);
pCurList = pListNext;
}
@ -1559,10 +1559,8 @@ SDL_SYS_JoystickClose(SDL_Joystick * joystick)
IDirectInputDevice8_Release(joystick->hwdata->InputDevice);
}
if (joystick->hwdata != NULL) {
/* free system specific hardware data */
SDL_free(joystick->hwdata);
}
/* free system specific hardware data */
SDL_free(joystick->hwdata);
joystick->closed = 1;
}

14
src/joystick/windows/SDL_mmjoystick.c
View file

@ -384,11 +384,9 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
void
SDL_SYS_JoystickClose(SDL_Joystick * joystick)
{
if (joystick->hwdata != NULL) {
/* free system specific hardware data */
SDL_free(joystick->hwdata);
joystick->hwdata = NULL;
}
/* free system specific hardware data */
SDL_free(joystick->hwdata);
joystick->hwdata = NULL;
}
/* Function to perform any system-specific joystick related cleanup */
@ -397,10 +395,8 @@ SDL_SYS_JoystickQuit(void)
{
int i;
for (i = 0; i < MAX_JOYSTICKS; i++) {
if (SYS_JoystickName[i] != NULL) {
SDL_free(SYS_JoystickName[i]);
SYS_JoystickName[i] = NULL;
}
SDL_free(SYS_JoystickName[i]);
SYS_JoystickName[i] = NULL;
}
}

4
src/render/SDL_render.c
View file

@ -1712,9 +1712,7 @@ SDL_DestroyTexture(SDL_Texture * texture)
if (texture->yuv) {
SDL_SW_DestroyYUVTexture(texture->yuv);
}
if (texture->pixels) {
SDL_free(texture->pixels);
}
SDL_free(texture->pixels);
renderer->DestroyTexture(renderer, texture);
SDL_free(texture);

12
src/render/SDL_yuv_sw.c
View file

@ -1335,15 +1335,9 @@ void
SDL_SW_DestroyYUVTexture(SDL_SW_YUVTexture * swdata)
{
if (swdata) {
if (swdata->pixels) {
SDL_free(swdata->pixels);
}
if (swdata->colortab) {
SDL_free(swdata->colortab);
}
if (swdata->rgb_2_pix) {
SDL_free(swdata->rgb_2_pix);
}
SDL_free(swdata->pixels);
SDL_free(swdata->colortab);
SDL_free(swdata->rgb_2_pix);
if (swdata->stretch) {
SDL_FreeSurface(swdata->stretch);
}

4
src/render/direct3d/SDL_render_d3d.c
View file

@ -1813,9 +1813,7 @@ D3D_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
if (data->vtexture) {
IDirect3DTexture9_Release(data->vtexture);
}
if (data->pixels) {
SDL_free(data->pixels);
}
SDL_free(data->pixels);
SDL_free(data);
texture->driverdata = NULL;
}

4
src/render/opengl/SDL_render_gl.c
View file

@ -1318,9 +1318,7 @@ GL_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
renderdata->glDeleteTextures(1, &data->utexture);
renderdata->glDeleteTextures(1, &data->vtexture);
}
if (data->pixels) {
SDL_free(data->pixels);
}
SDL_free(data->pixels);
SDL_free(data);
texture->driverdata = NULL;
}

8
src/render/opengles/SDL_render_gles.c
View file

@ -573,9 +573,7 @@ GLES_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
data->format,
data->formattype,
src);
if (blob) {
SDL_free(blob);
}
SDL_free(blob);
if (renderdata->glGetError() != GL_NO_ERROR)
{
@ -1116,9 +1114,7 @@ GLES_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
if (data->texture) {
renderdata->glDeleteTextures(1, &data->texture);
}
if (data->pixels) {
SDL_free(data->pixels);
}
SDL_free(data->pixels);
SDL_free(data);
texture->driverdata = NULL;
}

8
src/render/opengles2/SDL_render_gles2.c
View file

@ -336,9 +336,7 @@ GLES2_DestroyRenderer(SDL_Renderer *renderer)
}
SDL_GL_DeleteContext(rdata->context);
}
if (rdata->shader_formats) {
SDL_free(rdata->shader_formats);
}
SDL_free(rdata->shader_formats);
SDL_free(rdata);
}
SDL_free(renderer);
@ -541,9 +539,7 @@ GLES2_UpdateTexture(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect
tdata->pixel_format,
tdata->pixel_type,
src);
if (blob) {
SDL_free(blob);
}
SDL_free(blob);
if (rdata->glGetError() != GL_NO_ERROR) {
return SDL_SetError("Failed to update texture");

5
src/render/psp/SDL_render_psp.c
View file

@ -988,10 +988,7 @@ PSP_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
if(psp_texture == 0)
return;
if(psp_texture->data != 0)
{
SDL_free(psp_texture->data);
}
SDL_free(psp_texture->data);
SDL_free(psp_texture);
texture->driverdata = NULL;
}

4
src/render/software/SDL_render_sw.c
View file

@ -718,9 +718,7 @@ SW_DestroyRenderer(SDL_Renderer * renderer)
{
SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
if (data) {
SDL_free(data);
}
SDL_free(data);
SDL_free(renderer);
}

2
src/stdlib/SDL_iconv.c
View file

@ -843,7 +843,7 @@ SDL_iconv(SDL_iconv_t cd,
int
SDL_iconv_close(SDL_iconv_t cd)
{
if (cd && cd != (SDL_iconv_t) - 1) {
if (cd != (SDL_iconv_t)-1) {
SDL_free(cd);
}
return 0;

4
src/test/SDL_test_common.c
View file

@ -1388,9 +1388,7 @@ SDLTest_CommonQuit(SDLTest_CommonState * state)
{
int i;
if (state->windows) {
SDL_free(state->windows);
}
SDL_free(state->windows);
if (state->renderers) {
for (i = 0; i < state->num_windows; ++i) {
if (state->renderers[i]) {

6
src/video/SDL_RLEaccel.c
View file

@ -1558,10 +1558,8 @@ SDL_UnRLESurface(SDL_Surface * surface, int recode)
surface->map->info.flags &=
~(SDL_COPY_RLE_COLORKEY | SDL_COPY_RLE_ALPHAKEY);
if (surface->map->data) {
SDL_free(surface->map->data);
surface->map->data = NULL;
}
SDL_free(surface->map->data);
surface->map->data = NULL;
}
}

4
src/video/SDL_clipboard.c
View file

@ -35,9 +35,7 @@ SDL_SetClipboardText(const char *text)
if (_this->SetClipboardText) {
return _this->SetClipboardText(_this, text);
} else {
if (_this->clipboard_text) {
SDL_free(_this->clipboard_text);
}
SDL_free(_this->clipboard_text);
_this->clipboard_text = SDL_strdup(text);
return 0;
}

10
src/video/SDL_pixels.c
View file

@ -707,9 +707,7 @@ SDL_FreePalette(SDL_Palette * palette)
if (--palette->refcount > 0) {
return;
}
if (palette->colors) {
SDL_free(palette->colors);
}
SDL_free(palette->colors);
SDL_free(palette);
}
@ -985,10 +983,8 @@ SDL_InvalidateMap(SDL_BlitMap * map)
map->dst = NULL;
map->src_palette_version = 0;
map->dst_palette_version = 0;
if (map->info.table) {
SDL_free(map->info.table);
map->info.table = NULL;
}
SDL_free(map->info.table);
map->info.table = NULL;
}
int

2
src/video/SDL_surface.c
View file

@ -1076,7 +1076,7 @@ SDL_FreeSurface(SDL_Surface * surface)
SDL_FreeBlitMap(surface->map);
surface->map = NULL;
}
if (surface->pixels && ((surface->flags & SDL_PREALLOC) != SDL_PREALLOC)) {
if (!(surface->flags & SDL_PREALLOC)) {
SDL_free(surface->pixels);
}
SDL_free(surface);

52
src/video/SDL_video.c
View file

@ -263,10 +263,8 @@ SDL_CreateWindowTexture(_THIS, SDL_Window * window, Uint32 * format, void ** pix
SDL_DestroyTexture(data->texture);
data->texture = NULL;
}
if (data->pixels) {
SDL_free(data->pixels);
data->pixels = NULL;
}
SDL_free(data->pixels);
data->pixels = NULL;
if (SDL_GetRendererInfo(data->renderer, &info) < 0) {
return -1;
@ -351,9 +349,7 @@ SDL_DestroyWindowTexture(_THIS, SDL_Window * window)
if (data->renderer) {
SDL_DestroyRenderer(data->renderer);
}
if (data->pixels) {
SDL_free(data->pixels);
}
SDL_free(data->pixels);
SDL_free(data);
}
@ -1407,9 +1403,7 @@ SDL_SetWindowTitle(SDL_Window * window, const char *title)
if (title == window->title) {
return;
}
if (window->title) {
SDL_free(window->title);
}
SDL_free(window->title);
if (title && *title) {
window->title = SDL_strdup(title);
} else {
@ -2188,15 +2182,11 @@ SDL_DestroyWindow(SDL_Window * window)
window->magic = NULL;
/* Free memory associated with the window */
if (window->title) {
SDL_free(window->title);
}
SDL_free(window->title);
if (window->icon) {
SDL_FreeSurface(window->icon);
}
if (window->gamma) {
SDL_free(window->gamma);
}
SDL_free(window->gamma);
while (window->data) {
SDL_WindowUserData *data = window->data;
@ -2283,23 +2273,15 @@ SDL_VideoQuit(void)
for (i = 0; i < _this->num_displays; ++i) {
SDL_VideoDisplay *display = &_this->displays[i];
for (j = display->num_display_modes; j--;) {
if (display->display_modes[j].driverdata) {
SDL_free(display->display_modes[j].driverdata);
display->display_modes[j].driverdata = NULL;
}
}
if (display->display_modes) {
SDL_free(display->display_modes);
display->display_modes = NULL;
}
if (display->desktop_mode.driverdata) {
SDL_free(display->desktop_mode.driverdata);
display->desktop_mode.driverdata = NULL;
}
if (display->driverdata) {
SDL_free(display->driverdata);
display->driverdata = NULL;
SDL_free(display->display_modes[j].driverdata);
display->display_modes[j].driverdata = NULL;
}
SDL_free(display->display_modes);
display->display_modes = NULL;
SDL_free(display->desktop_mode.driverdata);
display->desktop_mode.driverdata = NULL;
SDL_free(display->driverdata);
display->driverdata = NULL;
}
if (_this->displays) {
for (i = 0; i < _this->num_displays; ++i) {
@ -2309,10 +2291,8 @@ SDL_VideoQuit(void)
_this->displays = NULL;
_this->num_displays = 0;
}
if (_this->clipboard_text) {
SDL_free(_this->clipboard_text);
_this->clipboard_text = NULL;
}
SDL_free(_this->clipboard_text);
_this->clipboard_text = NULL;
_this->free(_this);
_this = NULL;
}

4
src/video/cocoa/SDL_cocoamodes.m
View file

@ -281,7 +281,7 @@ Cocoa_InitModes(_THIS)
display.name = (char *)Cocoa_GetDisplayName(displays[i]);
if (!GetDisplayMode (_this, moderef, &mode)) {
Cocoa_ReleaseDisplayMode(_this, moderef);
if (display.name) SDL_free(display.name);
SDL_free(display.name);
SDL_free(displaydata);
continue;
}
@ -290,7 +290,7 @@ Cocoa_InitModes(_THIS)
display.current_mode = mode;
display.driverdata = displaydata;
SDL_AddVideoDisplay(&display);
if (display.name) SDL_free(display.name);
SDL_free(display.name);
}
}
SDL_stack_free(displays);

4
src/video/cocoa/SDL_cocoavideo.m
View file

@ -71,9 +71,7 @@ Cocoa_CreateDevice(int devindex)
}
if (!data) {
SDL_OutOfMemory();
if (device) {
SDL_free(device);
}
SDL_free(device);
return NULL;
}
device->driverdata = data;

4
src/video/directfb/SDL_DirectFB_render.c
View file

@ -1226,9 +1226,7 @@ DirectFB_DestroyRenderer(SDL_Renderer * renderer)
}
#endif
if (data) {
SDL_free(data);
}
SDL_free(data);
SDL_free(renderer);
}

2
src/video/directfb/SDL_DirectFB_video.h
View file

@ -76,7 +76,7 @@
#define DFBENV_USE_WM "SDL_DIRECTFB_WM" /* Default: off */
#define SDL_DFB_RELEASE(x) do { if ( (x) != NULL ) { SDL_DFB_CHECK(x->Release(x)); x = NULL; } } while (0)
#define SDL_DFB_FREE(x) do { if ( (x) != NULL ) { SDL_free(x); x = NULL; } } while (0)
#define SDL_DFB_FREE(x) do { SDL_free((x)); (x) = NULL; } while (0)
#define SDL_DFB_UNLOCK(x) do { if ( (x) != NULL ) { x->Unlock(x); } } while (0)
#define SDL_DFB_CONTEXT "SDL_DirectFB"

4
src/video/dummy/SDL_nullvideo.c
View file

@ -82,9 +82,7 @@ DUMMY_CreateDevice(int devindex)
device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
if (!device) {
SDL_OutOfMemory();
if (device) {
SDL_free(device);
}
SDL_free(device);
return (0);
}

4
src/video/uikit/SDL_uikitvideo.m
View file

@ -63,9 +63,7 @@ UIKit_CreateDevice(int devindex)
/* Initialize all variables that we clean on shutdown */
device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
if (!device) {
if (device) {
SDL_free(device);
}
SDL_free(device);
SDL_OutOfMemory();
return (0);
}

4
src/video/windows/SDL_windowsmessagebox.c
View file

@ -233,9 +233,7 @@ static SDL_bool AddDialogButton(WIN_DialogData *dialog, int x, int y, int w, int
static void FreeDialogData(WIN_DialogData *dialog)
{
if (dialog->data) {
SDL_free(dialog->data);
}
SDL_free(dialog->data);
SDL_free(dialog);
}

4
src/video/windows/SDL_windowsvideo.c
View file

@ -75,9 +75,7 @@ WIN_CreateDevice(int devindex)
data = NULL;
}
if (!data) {
if (device) {
SDL_free(device);
}
SDL_free(device);
SDL_OutOfMemory();
return NULL;
}

4
src/video/windows/SDL_windowswindow.c
View file

@ -319,9 +319,7 @@ WIN_SetWindowTitle(_THIS, SDL_Window * window)
title = NULL;
}
SetWindowText(hwnd, title ? title : TEXT(""));
if (title) {
SDL_free(title);
}
SDL_free(title);
}
void

6
src/video/x11/SDL_x11opengl.c
View file

@ -267,10 +267,8 @@ X11_GL_UnloadLibrary(_THIS)
#endif
/* Free OpenGL memory */
if (_this->gl_data) {
SDL_free(_this->gl_data);
_this->gl_data = NULL;
}
SDL_free(_this->gl_data);
_this->gl_data = NULL;
}
static SDL_bool

4
src/video/x11/SDL_x11video.c
View file

@ -565,9 +565,7 @@ X11_VideoQuit(_THIS)
{
SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
if (data->classname) {
SDL_free(data->classname);
}
SDL_free(data->classname);
#ifdef X_HAVE_UTF8_STRING
if (data->im) {
XCloseIM(data->im);

8
test/testautomation.c
View file

@ -113,12 +113,8 @@ main(int argc, char *argv[])
}
/* Clean up */
if (userRunSeed != NULL) {
SDL_free(userRunSeed);
}
if (filter != NULL) {
SDL_free(filter);
}
SDL_free(userRunSeed);
SDL_free(filter);
/* Shutdown everything */
quit(result);

4
test/testautomation_audio.c
View file

@ -747,11 +747,9 @@ int audio_convertAudio()
SDLTest_AssertCheck(cvt.len_ratio > 0.0, "Verify conversion length ratio; expected: >0; got: %f", cvt.len_ratio);
/* Free converted buffer */
if (cvt.buf != NULL) {
SDL_free(cvt.buf);
cvt.buf = NULL;
}
}
}
}
}
}

12
test/testautomation_clipboard.c
View file

@ -41,7 +41,7 @@ clipboard_testGetClipboardText(void *arg)
charResult = SDL_GetClipboardText();
SDLTest_AssertPass("Call to SDL_GetClipboardText succeeded");
if (charResult) SDL_free(charResult);
SDL_free(charResult);
return TEST_COMPLETED;
}
@ -69,8 +69,8 @@ clipboard_testSetClipboardText(void *arg)
textRef, text);
/* Cleanup */
if (textRef) SDL_free(textRef);
if (text) SDL_free(text);
SDL_free(textRef);
SDL_free(text);
return TEST_COMPLETED;
}
@ -145,9 +145,9 @@ clipboard_testClipboardTextFunctions(void *arg)
textRef, charResult);
/* Cleanup */
if (textRef) SDL_free(textRef);
if (text) SDL_free(text);
if (charResult) SDL_free(charResult);
SDL_free(textRef);
SDL_free(text);
SDL_free(charResult);
return TEST_COMPLETED;
}

4
test/testautomation_render.c
View file

@ -995,9 +995,7 @@ _compare(SDL_Surface *referenceSurface, int allowable_error)
SDLTest_AssertCheck(result == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", result);
/* Clean up. */
if (pixels != NULL) {
SDL_free(pixels);
}
SDL_free(pixels);
if (testSurface != NULL) {
SDL_FreeSurface(testSurface);
}

8
test/testautomation_video.c
View file

@ -1714,10 +1714,10 @@ video_getSetWindowData(void *arg)
_destroyVideoSuiteTestWindow(window);
cleanup:
if (referenceUserdata != NULL) SDL_free(referenceUserdata);
if (referenceUserdata2 != NULL) SDL_free(referenceUserdata2);
if (userdata != NULL) SDL_free(userdata);
if (userdata2 != NULL) SDL_free(userdata2);
SDL_free(referenceUserdata);
SDL_free(referenceUserdata2);
SDL_free(userdata);
SDL_free(userdata2);
return returnValue;
}

8
test/testiconv.c
View file

@ -75,12 +75,8 @@ main(int argc, char *argv[])
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "FAIL: %s\n", formats[i]);
++errors;
}
if (test[0]) {
SDL_free(test[0]);
}
if (test[1]) {
SDL_free(test[1]);
}
SDL_free(test[0]);
SDL_free(test[1]);
}
test[0] = SDL_iconv_string("UTF-8", "UCS-4", ucs4, len);
SDL_free(ucs4);

12
test/testsprite2.c
View file

@ -42,15 +42,9 @@ static int iterations = -1;
static void
quit(int rc)
{
if (sprites) {
SDL_free(sprites);
}
if (positions) {
SDL_free(positions);
}
if (velocities) {
SDL_free(velocities);
}
SDL_free(sprites);
SDL_free(positions);
SDL_free(velocities);
SDLTest_CommonQuit(state);
exit(rc);
}