comparison sidlib.c @ 262:ef1d6d16718e

s/SIDLibSTILSubNode/SIDLibSTILSubTune/g
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 05 Jan 2020 23:47:28 +0200
parents 39a03560163d
children 0b66189c73d7
comparison
equal deleted inserted replaced
261:39a03560163d 262:ef1d6d16718e
602 // Re-allocate subtunes pointers structure if needed 602 // Re-allocate subtunes pointers structure if needed
603 if (nsubTune > node->nsubtunes) 603 if (nsubTune > node->nsubtunes)
604 { 604 {
605 size_t clearIndex, clearLength; 605 size_t clearIndex, clearLength;
606 606
607 node->subtunes = (SIDLibSTILSubNode **) th_realloc( 607 node->subtunes = (SIDLibSTILSubTune **) th_realloc(
608 node->subtunes, (nsubTune + 1) * sizeof(SIDLibSTILSubNode **)); 608 node->subtunes, (nsubTune + 1) * sizeof(SIDLibSTILSubTune **));
609 609
610 if (node->subtunes == NULL) 610 if (node->subtunes == NULL)
611 return THERR_MALLOC; 611 return THERR_MALLOC;
612 612
613 // Clear the newly allocated memory 613 // Clear the newly allocated memory
620 { 620 {
621 clearIndex = node->nsubtunes + 1; 621 clearIndex = node->nsubtunes + 1;
622 clearLength = nsubTune - clearIndex + 1; 622 clearLength = nsubTune - clearIndex + 1;
623 } 623 }
624 624
625 memset(&(node->subtunes[clearIndex]), 0, clearLength * sizeof(SIDLibSTILSubNode **)); 625 memset(&(node->subtunes[clearIndex]), 0, clearLength * sizeof(SIDLibSTILSubTune **));
626 626
627 node->nsubtunes = nsubTune; 627 node->nsubtunes = nsubTune;
628 } 628 }
629 629
630 // Allocate memory for the specified subtune 630 // Allocate memory for the specified subtune
631 if (alloc && node->subtunes[nsubTune] == NULL) 631 if (alloc && node->subtunes[nsubTune] == NULL)
632 { 632 {
633 node->subtunes[nsubTune] = (SIDLibSTILSubNode *) th_malloc0(sizeof(SIDLibSTILSubNode)); 633 node->subtunes[nsubTune] = (SIDLibSTILSubTune *) th_malloc0(sizeof(SIDLibSTILSubTune));
634 if (node->subtunes[nsubTune] == NULL) 634 if (node->subtunes[nsubTune] == NULL)
635 return THERR_MALLOC; 635 return THERR_MALLOC;
636 } 636 }
637 637
638 return THERR_OK; 638 return THERR_OK;
643 { 643 {
644 if (node != NULL) 644 if (node != NULL)
645 { 645 {
646 for (int i = 0; i <= node->nsubtunes; i++) 646 for (int i = 0; i <= node->nsubtunes; i++)
647 { 647 {
648 SIDLibSTILSubNode *subTune = node->subtunes[i]; 648 SIDLibSTILSubTune *subTune = node->subtunes[i];
649 if (subTune != NULL) 649 if (subTune != NULL)
650 { 650 {
651 for (int field = 0; field < STF_LAST; field++) 651 for (int field = 0; field < STF_LAST; field++)
652 th_free(subTune->fields[field]); 652 th_free(subTune->fields[field]);
653 653