# HG changeset patch # User Matti Hamalainen # Date 1578260885 -7200 # Node ID 0b66189c73d7534fb4d22d82d5b64c095005e5d7 # Parent ef1d6d16718e9a53630b6f8ce2b677969fe77ed8 s/subTune/subtune/g diff -r ef1d6d16718e -r 0b66189c73d7 sidlib.c --- a/sidlib.c Sun Jan 05 23:47:28 2020 +0200 +++ b/sidlib.c Sun Jan 05 23:48:05 2020 +0200 @@ -594,18 +594,18 @@ } -static int sidlib_stildb_entry_realloc(SIDLibSTILNode *node, const int nsubTune, const BOOL alloc) +static int sidlib_stildb_entry_realloc(SIDLibSTILNode *node, const int nsubtune, const BOOL alloc) { if (node == NULL) return THERR_NULLPTR; // Re-allocate subtunes pointers structure if needed - if (nsubTune > node->nsubtunes) + if (nsubtune > node->nsubtunes) { size_t clearIndex, clearLength; node->subtunes = (SIDLibSTILSubTune **) th_realloc( - node->subtunes, (nsubTune + 1) * sizeof(SIDLibSTILSubTune **)); + node->subtunes, (nsubtune + 1) * sizeof(SIDLibSTILSubTune **)); if (node->subtunes == NULL) return THERR_MALLOC; @@ -614,24 +614,24 @@ if (node->nsubtunes == 0) { clearIndex = 0; - clearLength = nsubTune + 1; + clearLength = nsubtune + 1; } else { clearIndex = node->nsubtunes + 1; - clearLength = nsubTune - clearIndex + 1; + clearLength = nsubtune - clearIndex + 1; } memset(&(node->subtunes[clearIndex]), 0, clearLength * sizeof(SIDLibSTILSubTune **)); - node->nsubtunes = nsubTune; + node->nsubtunes = nsubtune; } // Allocate memory for the specified subtune - if (alloc && node->subtunes[nsubTune] == NULL) + if (alloc && node->subtunes[nsubtune] == NULL) { - node->subtunes[nsubTune] = (SIDLibSTILSubTune *) th_malloc0(sizeof(SIDLibSTILSubTune)); - if (node->subtunes[nsubTune] == NULL) + node->subtunes[nsubtune] = (SIDLibSTILSubTune *) th_malloc0(sizeof(SIDLibSTILSubTune)); + if (node->subtunes[nsubtune] == NULL) return THERR_MALLOC; } @@ -645,13 +645,13 @@ { for (int i = 0; i <= node->nsubtunes; i++) { - SIDLibSTILSubTune *subTune = node->subtunes[i]; - if (subTune != NULL) + SIDLibSTILSubTune *subtune = node->subtunes[i]; + if (subtune != NULL) { for (int field = 0; field < STF_LAST; field++) - th_free(subTune->fields[field]); + th_free(subtune->fields[field]); - th_free(subTune); + th_free(subtune } }