Mercurial > hg > dmlib
changeset 1227:a4a9ce298cdd
Simplify jssFreeModule() by using jssFree*() functions for freeing parts of
the data.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Fri, 06 Mar 2015 10:11:24 +0200 |
parents | 18baa42db260 |
children | ccc6f97a077e |
files | minijss/jssmod.c |
diffstat | 1 files changed, 4 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/minijss/jssmod.c Fri Mar 06 10:04:11 2015 +0200 +++ b/minijss/jssmod.c Fri Mar 06 10:11:24 2015 +0200 @@ -308,53 +308,18 @@ // Free patterns for (i = 0; i < module->npatterns; i++) - { - if (module->patterns[i] != NULL) - { - JSSPattern *pat = module->patterns[i]; - dmFree(pat->data); - dmFree(pat); - module->patterns[i] = NULL; - } - } + jssFreePattern(module->patterns[i]); // Free the "empty" pattern - JSSPattern *pat = module->patterns[jsetMaxPatterns]; - if (pat != NULL) - { - dmFree(pat->data); - dmFree(pat); - module->patterns[i] = NULL; - } + jssFreePattern(module->patterns[jsetMaxPatterns]); // Free instruments for (i = 0; i < module->ninstruments; i++) - { - if (module->instruments[i] != NULL) - { - JSSInstrument *inst = module->instruments[i]; -#ifndef JSS_LIGHT - dmFree(inst->desc); -#endif - dmFree(inst->data); - dmFree(inst); - module->instruments[i] = NULL; - } - } + jssFreeInstrument(module->instruments[i]); // Free extended instruments for (i = 0; i < module->nextInstruments; i++) - { - if (module->extInstruments[i] != NULL) - { - JSSExtInstrument *ext = module->extInstruments[i]; -#ifndef JSS_LIGHT - dmFree(ext->desc); -#endif - dmFree(ext); - module->extInstruments[i] = NULL; - } - } + jssFreeExtInstrument(module->extInstruments[i]); // Free mutex #ifdef JSS_SUP_THREADS