# HG changeset patch # User Matti Hamalainen # Date 1578260848 -7200 # Node ID ef1d6d16718e9a53630b6f8ce2b677969fe77ed8 # Parent 39a03560163d228651614b509cf08768a32aa7eb s/SIDLibSTILSubNode/SIDLibSTILSubTune/g diff -r 39a03560163d -r ef1d6d16718e sidlib.c --- a/sidlib.c Sun Jan 05 23:01:29 2020 +0200 +++ b/sidlib.c Sun Jan 05 23:47:28 2020 +0200 @@ -604,8 +604,8 @@ { size_t clearIndex, clearLength; - node->subtunes = (SIDLibSTILSubNode **) th_realloc( - node->subtunes, (nsubTune + 1) * sizeof(SIDLibSTILSubNode **)); + node->subtunes = (SIDLibSTILSubTune **) th_realloc( + node->subtunes, (nsubTune + 1) * sizeof(SIDLibSTILSubTune **)); if (node->subtunes == NULL) return THERR_MALLOC; @@ -622,7 +622,7 @@ clearLength = nsubTune - clearIndex + 1; } - memset(&(node->subtunes[clearIndex]), 0, clearLength * sizeof(SIDLibSTILSubNode **)); + memset(&(node->subtunes[clearIndex]), 0, clearLength * sizeof(SIDLibSTILSubTune **)); node->nsubtunes = nsubTune; } @@ -630,7 +630,7 @@ // Allocate memory for the specified subtune if (alloc && node->subtunes[nsubTune] == NULL) { - node->subtunes[nsubTune] = (SIDLibSTILSubNode *) th_malloc0(sizeof(SIDLibSTILSubNode)); + node->subtunes[nsubTune] = (SIDLibSTILSubTune *) th_malloc0(sizeof(SIDLibSTILSubTune)); if (node->subtunes[nsubTune] == NULL) return THERR_MALLOC; } @@ -645,7 +645,7 @@ { for (int i = 0; i <= node->nsubtunes; i++) { - SIDLibSTILSubNode *subTune = node->subtunes[i]; + SIDLibSTILSubTune *subTune = node->subtunes[i]; if (subTune != NULL) { for (int field = 0; field < STF_LAST; field++) diff -r 39a03560163d -r ef1d6d16718e sidlib.h --- a/sidlib.h Sun Jan 05 23:01:29 2020 +0200 +++ b/sidlib.h Sun Jan 05 23:47:28 2020 +0200 @@ -47,7 +47,7 @@ }; -// STIL database subtune fields, see SIDLibSTILSubNode +// STIL database subtune fields, see SIDLibSTILSubTune enum { STF_NAME, @@ -84,7 +84,7 @@ typedef struct { char *fields[STF_LAST]; -} SIDLibSTILSubNode; +} SIDLibSTILSubTune; typedef struct @@ -93,7 +93,7 @@ char *filename; int nsubtunes; - SIDLibSTILSubNode **subtunes; + SIDLibSTILSubTune **subtunes; } SIDLibSTILNode;