# HG changeset patch # User Matti Hamalainen # Date 1578762694 -7200 # Node ID f3ba2ba894b13eb0ab854c143e214c543b67d56b # Parent 6291b08730dfd1f41f29e814ec307c2088c34ba2 Rename few HVSC related #defines to have SIDUTIL_ prefix. diff -r 6291b08730df -r f3ba2ba894b1 sidinfo.c --- a/sidinfo.c Sat Jan 11 18:35:40 2020 +0200 +++ b/sidinfo.c Sat Jan 11 19:11:34 2020 +0200 @@ -1211,13 +1211,13 @@ // If SLDB path is not set, autocheck for .md5 and .txt if (setSLDBPath == NULL) - setSLDBPath = sidutil_check_hvsc_file(setHVSCPath, SET_SLDB_FILEBASE, ".md5"); + setSLDBPath = sidutil_check_hvsc_file(setHVSCPath, SIDUTIL_SLDB_FILEBASE, ".md5"); if (setSLDBPath == NULL) - setSLDBPath = sidutil_check_hvsc_file(setHVSCPath, SET_SLDB_FILEBASE, ".txt"); + setSLDBPath = sidutil_check_hvsc_file(setHVSCPath, SIDUTIL_SLDB_FILEBASE, ".txt"); if (setSTILDBPath == NULL) - setSTILDBPath = sidutil_check_hvsc_file(setHVSCPath, SET_STILDB_FILENAME, NULL); + setSTILDBPath = sidutil_check_hvsc_file(setHVSCPath, SIDUTIL_STILDB_FILENAME, NULL); } if (setSLDBPath != NULL) diff -r 6291b08730df -r f3ba2ba894b1 sidutil.c --- a/sidutil.c Sat Jan 11 18:35:40 2020 +0200 +++ b/sidutil.c Sat Jan 11 19:11:34 2020 +0200 @@ -127,7 +127,7 @@ th_stat_data sdata; char *npath = th_strdup_printf("%s%c%s%c%s%s", hvscPath, TH_DIR_SEPARATOR_CHR, - SET_HVSC_DOCUMENTS, TH_DIR_SEPARATOR_CHR, + SIDUTIL_HVSC_DOCUMENTS, TH_DIR_SEPARATOR_CHR, filebase, fext != NULL ? fext : ""); if (npath != NULL && diff -r 6291b08730df -r f3ba2ba894b1 sidutil.h --- a/sidutil.h Sat Jan 11 18:35:40 2020 +0200 +++ b/sidutil.h Sat Jan 11 19:11:34 2020 +0200 @@ -22,13 +22,13 @@ // // HVSC documents directory -#define SET_HVSC_DOCUMENTS "DOCUMENTS" +#define SIDUTIL_HVSC_DOCUMENTS "DOCUMENTS" // Songlengths database filename prefix (.md5|.txt appended) -#define SET_SLDB_FILEBASE "Songlengths" +#define SIDUTIL_SLDB_FILEBASE "Songlengths" // STIL database file -#define SET_STILDB_FILENAME "STIL.txt" +#define SIDUTIL_STILDB_FILENAME "STIL.txt" enum