# HG changeset patch # User Matti Hamalainen # Date 1425629484 -7200 # Node ID a4a9ce298cddc9f564adbdc14f9a50cdab2701a9 # Parent 18baa42db260927a12645d75725659cc64f5628b Simplify jssFreeModule() by using jssFree*() functions for freeing parts of the data. diff -r 18baa42db260 -r a4a9ce298cdd minijss/jssmod.c --- 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