Mercurial > hg > sidinfo

diff sidinfo.c @ 222:3a01518fffe0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename sidlib functions from si_* prefix to sidlib_*.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 27 Dec 2019 11:12:42 +0200
parents 55697860d4a7
children 15a51252b73a
line wrap: on
line diff
--- a/sidinfo.c	Fri Dec 27 11:07:21 2019 +0200
+++ b/sidinfo.c	Fri Dec 27 11:12:42 2019 +0200
@@ -927,11 +927,11 @@
             break;
         case  5:
             if (psid->version >= 2)
-                PRS(si_get_sid_clock_str((psid->flags >> 2) & PSF_CLOCK_MASK), FALSE);
+                PRS(sidlib_get_sid_clock_str((psid->flags >> 2) & PSF_CLOCK_MASK), FALSE);
             break;
         case  6:
             if (psid->version >= 2)
-                PRS(si_get_sid_model_str((psid->flags >> 4) & PSF_MODEL_MASK), FALSE);
+                PRS(sidlib_get_sid_model_str((psid->flags >> 4) & PSF_MODEL_MASK), FALSE);
             break;
 
         case  7: PRI(psid->dataOffset); break;
@@ -949,7 +949,7 @@
                 if (flags == PSF_MODEL_UNKNOWN)
                     flags = (psid->flags >> 4) & PSF_MODEL_MASK;
 
-                PRS(si_get_sid_model_str(flags), FALSE);
+                PRS(sidlib_get_sid_model_str(flags), FALSE);
             }
             break;
         case 15:
@@ -959,7 +959,7 @@
                 if (flags == PSF_MODEL_UNKNOWN)
                     flags = (psid->flags >> 4) & PSF_MODEL_MASK;
 
-                PRS(si_get_sid_model_str(flags), FALSE);
+                PRS(sidlib_get_sid_model_str(flags), FALSE);
             }
             break;
         case 16:
@@ -1031,12 +1031,12 @@
     th_io_set_handlers(inFile, siError, NULL);
 
     // Read PSID data
-    if (!si_read_sid_file(inFile, &psid, setSLDBNewFormat))
+    if (!sidlib_read_sid_file(inFile, &psid, setSLDBNewFormat))
         goto error;
 
     // Get songlength information, if any
     if (sidSLDB != NULL)
-        psid->lengths = si_sldb_get_by_hash(sidSLDB, psid->hash);
+        psid->lengths = sidlib_sldb_get_by_hash(sidSLDB, psid->hash);
 
     // Output
     for (int index = 0; index < optFormat.nitems; index++)
@@ -1065,7 +1065,7 @@
 
     // Shutdown
 error:
-    si_free_sid_file(psid);
+    sidlib_free_sid_file(psid);
     th_io_free(inFile);
 
     return TRUE;
@@ -1293,13 +1293,13 @@
             setSLDBNewFormat ? ".md5" : ".txt",
             setSLDBPath);
 
-        if ((sidSLDB = si_sldb_new()) == NULL)
+        if ((sidSLDB = sidlib_sldb_new()) == NULL)
         {
             THERR("Could not allocate SLDB structure!\n");
             goto err;
         }
 
-        if ((ret = si_sldb_read(inFile, sidSLDB)) != THERR_OK)
+        if ((ret = sidlib_sldb_read(inFile, sidSLDB)) != THERR_OK)
         {
             THERR("Error parsing SLDB: %d, %s\n",
                 ret, th_error_str(ret));
@@ -1307,7 +1307,7 @@
         }
         th_io_close(inFile);
 
-        if ((ret = si_sldb_build_index(sidSLDB)) != THERR_OK)
+        if ((ret = sidlib_sldb_build_index(sidSLDB)) != THERR_OK)
         {
             THERR("Error building SLDB index: %d, %s.\n",
                 ret, th_error_str(ret));
@@ -1337,6 +1337,6 @@
 
     th_free(setHVSCPath);
     th_free(setSLDBPath);
-    si_sldb_free(sidSLDB);
+    sidlib_sldb_free(sidSLDB);
     return 0;
 }