diff options
| author | Chris Robinson <[email protected]> | 2016-08-03 17:36:42 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2016-08-03 17:36:42 -0700 |
| commit | 3b2d8d394984da94fd286c5d57dfd68f22e2740b (patch) | |
| tree | d668459e2dec5ea2295d3e05211b1a571b1a3d77 | |
| parent | 2b3c7f211c45616826f0fda721b2ccd3fe53f13a (diff) | |
Use al_calloc/al_free in more places
| -rw-r--r-- | OpenAL32/alEffect.c | 10 | ||||
| -rw-r--r-- | OpenAL32/alFilter.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/OpenAL32/alEffect.c b/OpenAL32/alEffect.c index 32053325..65a4dcb6 100644 --- a/OpenAL32/alEffect.c +++ b/OpenAL32/alEffect.c @@ -60,11 +60,11 @@ AL_API ALvoid AL_APIENTRY alGenEffects(ALsizei n, ALuint *effects) device = context->Device; for(cur = 0;cur < n;cur++) { - ALeffect *effect = calloc(1, sizeof(ALeffect)); + ALeffect *effect = al_calloc(16, sizeof(ALeffect)); ALenum err = AL_OUT_OF_MEMORY; if(!effect || (err=InitEffect(effect)) != AL_NO_ERROR) { - free(effect); + al_free(effect); alDeleteEffects(cur, effects); SET_ERROR_AND_GOTO(context, err, done); } @@ -76,7 +76,7 @@ AL_API ALvoid AL_APIENTRY alGenEffects(ALsizei n, ALuint *effects) { FreeThunkEntry(effect->id); memset(effect, 0, sizeof(ALeffect)); - free(effect); + al_free(effect); alDeleteEffects(cur, effects); SET_ERROR_AND_GOTO(context, err, done); @@ -115,7 +115,7 @@ AL_API ALvoid AL_APIENTRY alDeleteEffects(ALsizei n, const ALuint *effects) FreeThunkEntry(effect->id); memset(effect, 0, sizeof(*effect)); - free(effect); + al_free(effect); } done: @@ -381,7 +381,7 @@ ALvoid ReleaseALEffects(ALCdevice *device) // Release effect structure FreeThunkEntry(temp->id); memset(temp, 0, sizeof(ALeffect)); - free(temp); + al_free(temp); } } diff --git a/OpenAL32/alFilter.c b/OpenAL32/alFilter.c index daf981d5..fa3496c9 100644 --- a/OpenAL32/alFilter.c +++ b/OpenAL32/alFilter.c @@ -59,7 +59,7 @@ AL_API ALvoid AL_APIENTRY alGenFilters(ALsizei n, ALuint *filters) device = context->Device; for(cur = 0;cur < n;cur++) { - ALfilter *filter = calloc(1, sizeof(ALfilter)); + ALfilter *filter = al_calloc(16, sizeof(ALfilter)); if(!filter) { alDeleteFilters(cur, filters); @@ -74,7 +74,7 @@ AL_API ALvoid AL_APIENTRY alGenFilters(ALsizei n, ALuint *filters) { FreeThunkEntry(filter->id); memset(filter, 0, sizeof(ALfilter)); - free(filter); + al_free(filter); alDeleteFilters(cur, filters); SET_ERROR_AND_GOTO(context, err, done); @@ -113,7 +113,7 @@ AL_API ALvoid AL_APIENTRY alDeleteFilters(ALsizei n, const ALuint *filters) FreeThunkEntry(filter->id); memset(filter, 0, sizeof(*filter)); - free(filter); + al_free(filter); } done: @@ -641,7 +641,7 @@ ALvoid ReleaseALFilters(ALCdevice *device) // Release filter structure FreeThunkEntry(temp->id); memset(temp, 0, sizeof(ALfilter)); - free(temp); + al_free(temp); } } |