pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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 edc88be724
commit 08dfaaa2e6
63 changed files with 157 additions and 349 deletions
Download patch file Download diff file Expand all files Collapse all files

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;
}