Mercurial > hg > sidinfo

changeset 260:4a3e8960b3a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename some struct fields.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 05 Jan 2020 22:11:48 +0200
parents 4df54600633a
children 39a03560163d
files sidlib.c sidlib.h
diffstat 2 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/sidlib.c	Sun Jan 05 21:48:32 2020 +0200
+++ b/sidlib.c	Sun Jan 05 22:11:48 2020 +0200
@@ -600,38 +600,38 @@
         return THERR_NULLPTR;
 
     // Re-allocate subtunes pointers structure if needed
-    if (nsubTune > node->nsubTunes)
+    if (nsubTune > node->nsubtunes)
     {
         size_t clearIndex, clearLength;
 
-        node->subTunes = (SIDLibSTILSubNode **) th_realloc(
-            node->subTunes, (nsubTune + 1) * sizeof(SIDLibSTILSubNode **));
+        node->subtunes = (SIDLibSTILSubNode **) th_realloc(
+            node->subtunes, (nsubTune + 1) * sizeof(SIDLibSTILSubNode **));
 
-        if (node->subTunes == NULL)
+        if (node->subtunes == NULL)
             return THERR_MALLOC;
 
         // Clear the newly allocated memory
-        if (node->nsubTunes == 0)
+        if (node->nsubtunes == 0)
         {
             clearIndex = 0;
             clearLength = nsubTune + 1;
         }
         else
         {
-            clearIndex = node->nsubTunes + 1;
+            clearIndex = node->nsubtunes + 1;
             clearLength = nsubTune - clearIndex + 1;
         }
 
-        memset(&(node->subTunes[clearIndex]), 0, clearLength * sizeof(SIDLibSTILSubNode **));
+        memset(&(node->subtunes[clearIndex]), 0, clearLength * sizeof(SIDLibSTILSubNode **));
 
-        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] = (SIDLibSTILSubNode *) th_malloc0(sizeof(SIDLibSTILSubNode));
-        if (node->subTunes[nsubTune] == NULL)
+        node->subtunes[nsubTune] = (SIDLibSTILSubNode *) th_malloc0(sizeof(SIDLibSTILSubNode));
+        if (node->subtunes[nsubTune] == NULL)
             return THERR_MALLOC;
     }
 
@@ -643,9 +643,9 @@
 {
     if (node != NULL)
     {
-        for (int i = 0; i <= node->nsubTunes; i++)
+        for (int i = 0; i <= node->nsubtunes; i++)
         {
-            SIDLibSTILSubNode *subTune = node->subTunes[i];
+            SIDLibSTILSubNode *subTune = node->subtunes[i];
             if (subTune != NULL)
             {
                 for (int field = 0; field < STF_LAST; field++)
@@ -655,7 +655,7 @@
             }
         }
 
-        th_free(node->subTunes);
+        th_free(node->subtunes);
         th_free(node->filename);
         th_free(node);
     }
@@ -1046,7 +1046,7 @@
                         goto out;
                     }
 
-                    entry->subTunes[subtune]->fields[field] = data;
+                    entry->subtunes[subtune]->fields[field] = data;
                 }
 
                 sidlib_stildb_set_parsemode(&ctx, PM_IDLE);
--- a/sidlib.h	Sun Jan 05 21:48:32 2020 +0200
+++ b/sidlib.h	Sun Jan 05 22:11:48 2020 +0200
@@ -92,8 +92,8 @@
     th_llist_t node;
 
     char *filename;
-    int nsubTunes;
-    SIDLibSTILSubNode **subTunes;
+    int nsubtunes;
+    SIDLibSTILSubNode **subtunes;
 } SIDLibSTILNode;