sidinfo: sidlib.c annotate

annotate sidlib.c @ 312:1950bb04a69b

Update NEWS.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 11 Jan 2020 14:28:22 +0200
parents	ee56f1f2b528
children	6d0143e43edf

rev	line source
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * SIDInfoLib - Way too simplistic PSID/RSID file library
171 d86ade7d0dfd Change copyright blurbs slightly. Matti Hamalainen <ccr@tnsp.org> parents: 170 diff changeset	3 * Programmed and designed by Matti 'ccr' Hämäläinen <ccr@tnsp.org>
227 2b3d5d49086d Bump copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 226 diff changeset	4 * (C) Copyright 2014-2020 Tecnic Software productions (TNSP)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 */
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 #include "sidlib.h"
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 #include "th_endian.h"
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	8 #include "th_string.h"
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	11 BOOL sidlib_fread_str(th_ioctx ctx, char *str, const size_t len)
128 2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	12 {
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	13 char *tmp;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	14
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	15 if ((*str = tmp = th_malloc(len + 1)) == NULL)
232 03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	16 {
03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	17 th_io_error(ctx, THERR_MALLOC,
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	18 "Could not allocate %" PRIu_SIZE_T " bytes for a string.",
232 03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	19 len);
128 2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	20 goto err;
232 03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	21 }
128 2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	22
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	23 if (!thfread_str(ctx, tmp, len))
232 03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	24 {
03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	25 th_io_error(ctx, THERR_FREAD,
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	26 "Could not read %" PRIu_SIZE_T " bytes from file.",
232 03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	27 len);
128 2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	28 goto err;
232 03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	29 }
128 2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	30
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	31 tmp[len] = 0;
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	32 return TRUE;
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	33
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	34 err:
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	35 th_free(tmp);
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	36 return FALSE;
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	37 }
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	38
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	39
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	40 static int sidlib_read_hash_data(th_ioctx ctx, SIDLibPSIDHeader psid,
166 e6c8a235ce2f Fix the load address handling in case of new SLDB format. Matti Hamalainen <ccr@tnsp.org> parents: 163 diff changeset	41 th_md5state_t *state, const BOOL newSLDB)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	43 int ret = THERR_OK;
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	44 uint8_t *data = NULL;
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	45 BOOL first = TRUE;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	46 size_t read;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	47
230 1e860046a4cc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	48 if ((data = (uint8_t *) th_malloc(SIDLIB_BUFFER_SIZE)) == NULL)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	49 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	50 ret = th_io_error(ctx, THERR_MALLOC,
82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	51 "Error allocating temporary data buffer of %d bytes.",
230 1e860046a4cc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	52 SIDLIB_BUFFER_SIZE);
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	53 goto exit;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	54 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	55
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	56 psid->dataSize = 0;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	57 do
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	58 {
230 1e860046a4cc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	59 read = thfread(data, sizeof(uint8_t), SIDLIB_BUFFER_SIZE, ctx);
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	60 psid->dataSize += read;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	61
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	62 // If load address is 0 in header and we have the first block, grab it
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	63 if (first && psid->loadAddress == 0)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	64 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	65 if (read < 4)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	66 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	67 ret = th_io_error(ctx, THERR_FREAD,
82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	68 "Error reading song data, unexpectedly small file.");
82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	69 goto exit;
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	70 }
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	71
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	72 // Grab the load address
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	73 psid->loadAddress = TH_LE16_TO_NATIVE((uint16_t ) data);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	74
203 b4a349f1c2f4 Actually fix the load address handling in hash calculation. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	75 // .. do not include the load address to the hash if NEW SLDB format
166 e6c8a235ce2f Fix the load address handling in case of new SLDB format. Matti Hamalainen <ccr@tnsp.org> parents: 163 diff changeset	76 if (newSLDB)
203 b4a349f1c2f4 Actually fix the load address handling in hash calculation. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	77 th_md5_append(state, &data[2], read - 2);
b4a349f1c2f4 Actually fix the load address handling in hash calculation. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	78 else
166 e6c8a235ce2f Fix the load address handling in case of new SLDB format. Matti Hamalainen <ccr@tnsp.org> parents: 163 diff changeset	79 th_md5_append(state, data, read);
e6c8a235ce2f Fix the load address handling in case of new SLDB format. Matti Hamalainen <ccr@tnsp.org> parents: 163 diff changeset	80
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	81 first = FALSE;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	82 }
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	83 else
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	84 if (read > 0)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	85 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	86 // Append data "as is"
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	87 th_md5_append(state, data, read);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	88 }
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	89 } while (read > 0 && !thfeof(ctx));
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	90
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	91 exit:
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	92 th_free(data);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	93 return ret;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	94 }
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	95
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	96
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	97 int sidlib_read_sid_file(th_ioctx ctx, SIDLibPSIDHeader psid, const BOOL newSLDB)
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	98 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	99 int ret = THERR_OK;
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	100 th_md5state_t state;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	101 off_t hdrStart, hdrEnd;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	102
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	103 hdrStart = thftell(ctx);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	104
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105 // Read PSID header in
223 a76276ff7ba8 Rename PSID_* constant defines to SIDLIB_PSID_. Matti Hamalainen <ccr@tnsp.org>* parents: 222 diff changeset	106 if (!thfread_str(ctx, (uint8_t *) psid->magic, SIDLIB_PSID_MAGIC_LEN) \|\|
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	107 !thfread_be16(ctx, &psid->version) \|\|
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	108 !thfread_be16(ctx, &psid->dataOffset) \|\|
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	109 !thfread_be16(ctx, &psid->loadAddress) \|\|
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	110 !thfread_be16(ctx, &psid->initAddress) \|\|
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	111 !thfread_be16(ctx, &psid->playAddress) \|\|
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	112 !thfread_be16(ctx, &psid->nSongs) \|\|
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	113 !thfread_be16(ctx, &psid->startSong) \|\|
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	114 !thfread_be32(ctx, &psid->speed))
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	115 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	116 ret = th_io_error(ctx, ctx->status,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	117 "Could not read PSID/RSID header.");
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	118 goto exit;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	119 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	120
223 a76276ff7ba8 Rename PSID_* constant defines to SIDLIB_PSID_. Matti Hamalainen <ccr@tnsp.org>* parents: 222 diff changeset	121 psid->magic[SIDLIB_PSID_MAGIC_LEN] = 0;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	122
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123 if ((psid->magic[0] != 'R' && psid->magic[0] != 'P') \|\|
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124 psid->magic[1] != 'S' \|\| psid->magic[2] != 'I' \|\| psid->magic[3] != 'D' \|\|
133 9cfa0553e7f9 Add support for reading PSID/RSID v4 in sidlib. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	125 psid->version < 1 \|\| psid->version > 4)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	127 ret = th_io_error(ctx, THERR_NOT_SUPPORTED,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	128 "Not a supported PSID or RSID file.");
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	129 goto exit;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	130 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	131
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	132 psid->isRSID = psid->magic[0] == 'R';
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	133
223 a76276ff7ba8 Rename PSID_* constant defines to SIDLIB_PSID_. Matti Hamalainen <ccr@tnsp.org>* parents: 222 diff changeset	134 if (!sidlib_fread_str(ctx, &psid->sidName, SIDLIB_PSID_STR_LEN) \|\|
a76276ff7ba8 Rename PSID_* constant defines to SIDLIB_PSID_. Matti Hamalainen <ccr@tnsp.org>* parents: 222 diff changeset	135 !sidlib_fread_str(ctx, &psid->sidAuthor, SIDLIB_PSID_STR_LEN) \|\|
a76276ff7ba8 Rename PSID_* constant defines to SIDLIB_PSID_. Matti Hamalainen <ccr@tnsp.org>* parents: 222 diff changeset	136 !sidlib_fread_str(ctx, &psid->sidCopyright, SIDLIB_PSID_STR_LEN))
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	137 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	138 ret = th_io_error(ctx, ctx->status,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	139 "Error reading SID file header data.");
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	140 goto exit;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143 // Check if we need to load PSIDv2NG header ...
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144 if (psid->version >= 2)
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145 {
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	146 // Yes, we need to
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	147 if (!thfread_be16(ctx, &psid->flags) \|\|
98 d9f38d657433 Match with th-libs API change. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	148 !thfread_u8(ctx, &psid->startPage) \|\|
d9f38d657433 Match with th-libs API change. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	149 !thfread_u8(ctx, &psid->pageLength) \|\|
133 9cfa0553e7f9 Add support for reading PSID/RSID v4 in sidlib. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	150 !thfread_u8(ctx, &psid->sid2Addr) \|\|
9cfa0553e7f9 Add support for reading PSID/RSID v4 in sidlib. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	151 !thfread_u8(ctx, &psid->sid3Addr))
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	152 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	153 ret = th_io_error(ctx, ctx->status,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	154 "Error reading PSID/RSID v2+ extra header data.");
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	155 goto exit;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	159 hdrEnd = thftell(ctx);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	160
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161 // Initialize MD5-hash calculation
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162 th_md5_init(&state);
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	164 if (newSLDB)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	165 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	166 // New Songlengths.md5 style hash calculation:
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	167 // We just hash the whole file, so seek back to beginning ..
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	168 thfseek(ctx, hdrStart, SEEK_SET);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	169
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	170 if ((ret = sidlib_read_hash_data(ctx, psid, &state, FALSE)) != THERR_OK)
82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	171 goto exit;
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	172
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	173 psid->dataSize -= hdrEnd - hdrStart;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	174 }
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	175 else
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	176 {
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	177 // "Old" Songlengths.txt style MD5 hash calculation
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	178 // We need to separately hash data etc.
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	179 if ((ret = sidlib_read_hash_data(ctx, psid, &state, TRUE)) != THERR_OK)
82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	180 goto exit;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	182 // Append header data to hash
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	183 th_md5_append_le16(&state, psid->initAddress);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	184 th_md5_append_le16(&state, psid->playAddress);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	185 th_md5_append_le16(&state, psid->nSongs);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	186
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	187 // Append song speed data to hash
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	188 uint8_t tmp8 = psid->isRSID ? 60 : 0;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	189 for (int index = 0; index < psid->nSongs && index < 32; index++)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	190 {
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	191 if (psid->isRSID)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	192 tmp8 = 60;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	193 else
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	194 tmp8 = (psid->speed & (1 << index)) ? 60 : 0;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	195
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	196 th_md5_append(&state, &tmp8, sizeof(tmp8));
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	197 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	198
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	199 // Rest of songs (more than 32)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	200 for (int index = 32; index < psid->nSongs; index++)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	201 th_md5_append(&state, &tmp8, sizeof(tmp8));
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	202
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	203 // PSIDv2NG specific
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	204 if (psid->version >= 2)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	205 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	206 // REFER TO SIDPLAY HEADERS FOR MORE INFORMATION
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	207 tmp8 = (psid->flags >> 2) & 3;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	208 if (tmp8 == 2)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	209 th_md5_append(&state, &tmp8, sizeof(tmp8));
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	210 }
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	211 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	212
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	213 // Calculate the hash
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	214 th_md5_finish(&state, psid->hash);
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	215
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	216 exit:
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	217 return ret;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	218 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	219
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	220
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	221 int sidlib_read_sid_file_alloc(th_ioctx ctx, SIDLibPSIDHeader *ppsid, const BOOL newSLDB)
226 c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	222 {
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	223 if ((*ppsid = th_malloc0(sizeof(SIDLibPSIDHeader))) == NULL)
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	224 return THERR_MALLOC;
228 1962b236d596 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	225
226 c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	226 (*ppsid)->allocated = TRUE;
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	227
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	228 return sidlib_read_sid_file(ctx, *ppsid, newSLDB);
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	229 }
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	230
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	231
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	232 void sidlib_free_sid_file(SIDLibPSIDHeader *psid)
126 c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	233 {
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	234 if (psid != NULL)
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	235 {
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	236 th_free(psid->sidName);
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	237 th_free(psid->sidAuthor);
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	238 th_free(psid->sidCopyright);
228 1962b236d596 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	239
226 c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	240 if (psid->allocated)
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	241 th_free(psid);
126 c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	242 }
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	243 }
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	244
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	245
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	246 const char *sidlib_get_sid_clock_str(const int flags)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	247 {
132 b3e034b8c4b9 Change how certain flags (for SID model and clock) are handled. Matti Hamalainen <ccr@tnsp.org> parents: 131 diff changeset	248 switch (flags)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	249 {
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	250 case PSF_CLOCK_UNKNOWN : return "Unknown";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	251 case PSF_CLOCK_PAL : return "PAL 50Hz";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	252 case PSF_CLOCK_NTSC : return "NTSC 60Hz";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	253 case PSF_CLOCK_ANY : return "PAL / NTSC";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	254 default : return "?";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	255 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	256 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	257
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	258
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	259 const char *sidlib_get_sid_model_str(const int flags)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	260 {
132 b3e034b8c4b9 Change how certain flags (for SID model and clock) are handled. Matti Hamalainen <ccr@tnsp.org> parents: 131 diff changeset	261 switch (flags)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	262 {
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	263 case PSF_MODEL_UNKNOWN : return "Unknown";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	264 case PSF_MODEL_MOS6581 : return "MOS6581";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	265 case PSF_MODEL_MOS8580 : return "MOS8580";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	266 case PSF_MODEL_ANY : return "MOS6581 / MOS8580";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	267 default : return "?";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	268 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	269 }
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	270
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	271
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	272 // Free memory allocated for given SLDB node
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	273 //
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	274 static void sidlib_sldb_node_free(SIDLibSLDBNode *node)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	275 {
170 2ba504fc8797 NULL checks. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	276 if (node != NULL)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	277 {
256 7fdcacbdfc00 Not using th_free_r() here. Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	278 th_free(node->lengths);
7fdcacbdfc00 Not using th_free_r() here. Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	279 th_free(node);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	280 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	281 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	282
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	283
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	284 // Parse a time-entry in SLDB format
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	285 //
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	286 static int sidlib_sldb_get_value(const char str, size_t pos)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	287 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	288 int result = 0;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	289
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	290 while (isdigit(str[*pos]))
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	291 result = (result * 10) + (str[(*pos)++] - '0');
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	292
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	293 return result;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	294 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	295
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	296
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	297 static int sidlib_sldb_gettime(const char str, size_t pos)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	298 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	299 int result;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	300
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	301 // Check if it starts with a digit
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	302 if (th_isdigit(str[*pos]))
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	303 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	304 // Get minutes-field
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	305 result = sidlib_sldb_get_value(str, pos) * 60;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	306
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	307 // Check the field separator char
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	308 if (str[*pos] == ':')
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	309 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	310 // Get seconds-field
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	311 (*pos)++;
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	312 result += sidlib_sldb_get_value(str, pos);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	313 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	314 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	315 result = -2;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	316 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	317 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	318 result = -1;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	319
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	320 // Ignore and skip the possible attributes
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	321 while (str[pos] && !th_isspace(str[pos]))
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	322 (*pos)++;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	323
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	324 return result;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	325 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	326
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	327
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	328 // Parse one SLDB definition line, return SLDB node
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	329 //
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	330 static int sidlib_sldb_parse_entry(th_ioctx ctx, SIDLibSLDBNode pnode, const char line)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	331 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	332 int ret = THERR_OK;
82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	333 SIDLibSLDBNode *node;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	334 size_t pos, tmpLen, savePos;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	335 BOOL isOK;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	336 int i;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	337
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	338 // Allocate new node
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	339 if ((pnode = node = (SIDLibSLDBNode ) th_malloc0(sizeof(SIDLibSLDBNode))) == NULL)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	340 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	341 ret = th_io_error(ctx, THERR_MALLOC,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	342 "Error allocating new SLDB node.");
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	343 goto exit;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	344 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	345
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	346 // Get hash value
160 27365eae837b Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	347 for (pos = 0, i = 0; i < TH_MD5HASH_LENGTH; i++, pos += 2)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	348 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	349 unsigned int tmpu;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	350 sscanf(&line[pos], "%2x", &tmpu);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	351 node->hash[i] = tmpu;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	352 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	353
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	354 // Get playtimes
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	355 th_findnext(line, &pos);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	356 if (line[pos] != '=')
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	357 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	358 ret = th_io_error(ctx, THERR_INVALID_DATA,
292 6454bfb584d6 Fix some format strings to use proper PRIu_SIZE_T where necessary. Matti Hamalainen <ccr@tnsp.org> parents: 266 diff changeset	359 "'=' expected on column #%" PRIu_SIZE_T ".",
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	360 pos);
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	361 goto exit;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	362 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	363
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	364 // First playtime is after '='
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	365 savePos = ++pos;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	366 tmpLen = strlen(line);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	367
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	368 // Get number of sub-tune lengths
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	369 isOK = TRUE;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	370 while (pos < tmpLen && isOK)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	371 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	372 th_findnext(line, &pos);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	373
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	374 if (sidlib_sldb_gettime(line, &pos) >= 0)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	375 node->nlengths++;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	376 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	377 isOK = FALSE;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	378 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	379
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	380 // Allocate memory for lengths
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	381 if (node->nlengths == 0)
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	382 {
82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	383 ret = THERR_OK;
82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	384 goto exit;
82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	385 }
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	386
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	387 if ((node->lengths = (int *) th_calloc(node->nlengths, sizeof(int))) == NULL)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	388 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	389 ret = th_io_error(ctx, THERR_MALLOC,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	390 "Error allocating SLDB entry length data.");
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	391 goto exit;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	392 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	393
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	394 // Read lengths in
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	395 for (i = 0, pos = savePos, isOK = TRUE;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	396 pos < tmpLen && i < node->nlengths && isOK; i++)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	397 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	398 int l;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	399 th_findnext(line, &pos);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	400
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	401 l = sidlib_sldb_gettime(line, &pos);
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	402
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	403 if (l >= 0)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	404 node->lengths[i] = l;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	405 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	406 isOK = FALSE;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	407 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	408
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	409 return ret;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	410
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	411 exit:
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	412 sidlib_sldb_node_free(node);
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	413 return ret;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	414 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	415
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	416
236 609bfc1bd628 Change sidlib_sldb_new() API to int sidlib_sldb_new(SIDLibSLDB *pdbh). Matti Hamalainen <ccr@tnsp.org>* parents: 232 diff changeset	417 int sidlib_sldb_new(SIDLibSLDB **pdbh)
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	418 {
236 609bfc1bd628 Change sidlib_sldb_new() API to int sidlib_sldb_new(SIDLibSLDB *pdbh). Matti Hamalainen <ccr@tnsp.org>* parents: 232 diff changeset	419 SIDLibSLDB *dbh;
609bfc1bd628 Change sidlib_sldb_new() API to int sidlib_sldb_new(SIDLibSLDB *pdbh). Matti Hamalainen <ccr@tnsp.org>* parents: 232 diff changeset	420 if ((dbh = pdbh = (SIDLibSLDB ) th_malloc0(sizeof(SIDLibSLDB))) == NULL)
609bfc1bd628 Change sidlib_sldb_new() API to int sidlib_sldb_new(SIDLibSLDB *pdbh). Matti Hamalainen <ccr@tnsp.org>* parents: 232 diff changeset	421 return THERR_MALLOC;
609bfc1bd628 Change sidlib_sldb_new() API to int sidlib_sldb_new(SIDLibSLDB *pdbh). Matti Hamalainen <ccr@tnsp.org>* parents: 232 diff changeset	422
609bfc1bd628 Change sidlib_sldb_new() API to int sidlib_sldb_new(SIDLibSLDB *pdbh). Matti Hamalainen <ccr@tnsp.org>* parents: 232 diff changeset	423 return THERR_OK;
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	424 }
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	425
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	426
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	427 // Read SLDB database to memory
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	428 //
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	429 int sidlib_sldb_read(th_ioctx ctx, SIDLibSLDB dbh)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	430 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	431 int ret = THERR_OK;
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	432 char *line = NULL;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	433
230 1e860046a4cc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	434 if ((line = th_malloc(SIDLIB_BUFFER_SIZE)) == NULL)
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	435 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	436 ret = th_io_error(ctx, THERR_MALLOC,
82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	437 "Error allocating temporary data buffer of %d bytes.",
230 1e860046a4cc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	438 SIDLIB_BUFFER_SIZE);
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	439 goto exit;
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	440 }
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	441
230 1e860046a4cc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	442 while (thfgets(line, SIDLIB_BUFFER_SIZE, ctx) != NULL)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	443 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	444 SIDLibSLDBNode *tmnode;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	445 size_t pos = 0;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	446 ctx->line++;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	447
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	448 th_findnext(line, &pos);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	449
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	450 // Check if it is datafield
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	451 if (th_isxdigit(line[pos]))
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	452 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	453 // Check the length of the hash
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	454 int hashLen;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	455 for (hashLen = 0; line[pos] && th_isxdigit(line[pos]); hashLen++, pos++);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	456
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	457 if (hashLen != TH_MD5HASH_LENGTH_CH)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	458 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	459 ret = th_io_error(ctx, THERR_INVALID_DATA,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	460 "Invalid MD5-hash.");
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	461 goto exit;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	462 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	463 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	464 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	465 // Parse and add node to db
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	466 if ((ret = sidlib_sldb_parse_entry(ctx, &tmnode, line)) != THERR_OK)
82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	467 goto exit;
82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	468
82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	469 th_llist_append_node((th_llist_t *) &dbh->nodes, (th_llist_t ) tmnode);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	470 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	471 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	472 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	473 if (line[pos] != ';' && line[pos] != '[' && line[pos] != 0)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	474 {
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	475 ret = th_io_error(ctx, THERR_INVALID_DATA,
292 6454bfb584d6 Fix some format strings to use proper PRIu_SIZE_T where necessary. Matti Hamalainen <ccr@tnsp.org> parents: 266 diff changeset	476 "Invalid line / unexpected data at column #%" PRIu_SIZE_T ".",
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	477 pos);
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	478 goto exit;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	479 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	480 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	481
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	482 exit:
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	483 th_free(line);
239 82540f819194 Clean up error handling. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	484 return ret;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	485 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	486
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	487
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	488 // Compare two given MD5-hashes.
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	489 // Return: 0 if equal
102 1362f00e4368 Rename function arguments. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	490 // negative if hash1 < hash2
1362f00e4368 Rename function arguments. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	491 // positive if hash1 > hash2
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	492 //
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	493 static int sidlib_sldb_compare_hash(th_md5hash_t hash1, th_md5hash_t hash2)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	494 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	495 int i, delta;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	496
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	497 for (i = delta = 0; i < TH_MD5HASH_LENGTH && !delta; i++)
102 1362f00e4368 Rename function arguments. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	498 delta = hash1[i] - hash2[i];
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	499
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	500 return delta;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	501 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	502
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	503
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	504 // Compare two nodes.
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	505 // We assume here that we never ever get NULL-pointers.
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	506 static int sidlib_sldb_compare_nodes(const void node1, const void node2)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	507 {
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	508 return sidlib_sldb_compare_hash(
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	509 ((SIDLibSLDBNode *) node1)->hash,
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	510 ((SIDLibSLDBNode *) node2)->hash);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	511 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	512
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	513
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	514 // (Re)create index
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	515 //
237 d28f3d537284 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 236 diff changeset	516 int sidlib_sldb_build_index(SIDLibSLDB *dbh)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	517 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	518 // Free old index
237 d28f3d537284 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 236 diff changeset	519 th_free_r(&(dbh->pindex));
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	520
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	521 // Get size of db
224 4bec78f45188 Use th_datastruct::th_llist_t instead of yet another linked list Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	522 dbh->nnodes = th_llist_length((th_llist_t *) dbh->nodes);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	523
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	524 // Check number of nodes
100 be62e4abe3a9 Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	525 if (dbh->nnodes > 0)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	526 {
224 4bec78f45188 Use th_datastruct::th_llist_t instead of yet another linked list Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	527 SIDLibSLDBNode *node;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	528 size_t i;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	529
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	530 // Allocate memory for index-table
100 be62e4abe3a9 Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	531 dbh->pindex = (SIDLibSLDBNode *) th_malloc(sizeof(SIDLibSLDBNode ) * dbh->nnodes);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	532 if (dbh->pindex == NULL)
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	533 return THERR_MALLOC;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	534
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	535 // Get node-pointers to table
224 4bec78f45188 Use th_datastruct::th_llist_t instead of yet another linked list Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	536 for (i = 0, node = dbh->nodes; node != NULL && i < dbh->nnodes;
4bec78f45188 Use th_datastruct::th_llist_t instead of yet another linked list Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	537 node = (SIDLibSLDBNode *) node->node.next)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	538 dbh->pindex[i++] = node;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	539
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	540 // Sort the indexes
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	541 qsort(dbh->pindex, dbh->nnodes, sizeof(SIDLibSLDBNode *), sidlib_sldb_compare_nodes);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	542 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	543
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	544 return THERR_OK;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	545 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	546
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	547
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	548 // Free a given song-length database
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	549 //
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	550 void sidlib_sldb_free(SIDLibSLDB *dbh)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	551 {
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	552 if (dbh != NULL)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	553 {
255 3c1cb0f39703 OOoops. Use th_llist_free_func_node() instead of th_llist_free_func(). Matti Hamalainen <ccr@tnsp.org> parents: 254 diff changeset	554 th_llist_free_func_node((th_llist_t *) dbh->nodes,
3c1cb0f39703 OOoops. Use th_llist_free_func_node() instead of th_llist_free_func(). Matti Hamalainen <ccr@tnsp.org> parents: 254 diff changeset	555 (void ()(th_llist_t )) sidlib_sldb_node_free);
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	556
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	557 dbh->nodes = NULL;
100 be62e4abe3a9 Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	558 dbh->nnodes = 0;
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	559
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	560 th_free_r(&dbh->pindex);
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	561 th_free(dbh);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	562 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	563 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	564
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	565
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	566 SIDLibSLDBNode sidlib_sldb_get_by_hash(SIDLibSLDB dbh, th_md5hash_t hash)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	567 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	568 SIDLibSLDBNode keyItem, key, *item;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	569
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	570 memcpy(&keyItem.hash, hash, sizeof(th_md5hash_t));
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	571 key = &keyItem;
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	572 item = bsearch(&key, dbh->pindex, dbh->nnodes, sizeof(dbh->pindex[0]), sidlib_sldb_compare_nodes);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	573
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	574 return (item != NULL) ? *item : NULL;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	575 }
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	576
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	577
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	578 /* STIL database handling functions
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	579 */
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	580 int sidlib_stildb_new(SIDLibSTILDB **pdbh)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	581 {
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	582 SIDLibSTILDB *dbh;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	583 if ((dbh = pdbh = (SIDLibSTILDB ) th_malloc0(sizeof(SIDLibSTILDB))) == NULL)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	584 return THERR_MALLOC;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	585
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	586 return THERR_OK;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	587 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	588
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	589
311 ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	590 SIDLibSTILSubTune sidlib_stildb_find_subtune(SIDLibSTILNode node, const int nsubtune)
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	591 {
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	592 for (size_t n = 0; n < node->nsubtunes; n++)
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	593 {
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	594 SIDLibSTILSubTune *subtune = &node->subtunes[n];
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	595 if (subtune->tune == nsubtune)
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	596 return subtune;
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	597 }
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	598 return NULL;
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	599 }
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	600
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	601
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	602 static int sidlib_stildb_entry_realloc(
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	603 SIDLibSTILNode *node,
264 5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	604 const int nsubtune, const BOOL alloc,
5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	605 const int nfield, const char *fdata)
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	606 {
311 ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	607 SIDLibSTILSubTune *subtune;
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	608
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	609 if (node == NULL)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	610 return THERR_NULLPTR;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	611
311 ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	612 // Get subtune or allocate new
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	613 if ((subtune = sidlib_stildb_find_subtune(node, nsubtune)) == NULL)
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	614 {
311 ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	615 node->subtunes = (SIDLibSTILSubTune *) th_realloc(
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	616 node->subtunes, (node->nsubtunes + 1) * sizeof(SIDLibSTILSubTune));
258 8d914417227d Avoid allocating one extra STIL node. Does not make much of a difference. Matti Hamalainen <ccr@tnsp.org> parents: 256 diff changeset	617
260 4a3e8960b3a9 Rename some struct fields. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	618 if (node->subtunes == NULL)
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	619 return THERR_MALLOC;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	620
311 ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	621 subtune = &node->subtunes[node->nsubtunes];
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	622 memset(subtune, 0, sizeof(SIDLibSTILSubTune));
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	623 subtune->tune = nsubtune;
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	624 node->nsubtunes++;
264 5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	625 }
5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	626
5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	627 // Allocate field space, if needed
5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	628 if (alloc && nfield >= 0 && nfield < STF_LAST)
5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	629 {
311 ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	630 SIDLibSTILField *field = &subtune->fields[nfield];
264 5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	631
5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	632 if ((field->data = th_realloc(field->data, (field->ndata + 1) * sizeof(char *))) == NULL)
5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	633 return THERR_MALLOC;
5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	634
5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	635 field->data[field->ndata] = th_strdup(fdata);
5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	636 field->ndata++;
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	637 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	638
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	639 return THERR_OK;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	640 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	641
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	642
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	643 static void sidlib_stildb_node_free(SIDLibSTILNode *node)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	644 {
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	645 if (node != NULL)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	646 {
311 ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	647 for (size_t nsubtune = 0; nsubtune < node->nsubtunes; nsubtune++)
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	648 {
311 ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	649 SIDLibSTILSubTune *subtune = &node->subtunes[nsubtune];
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	650 for (int nfield = 0; nfield < STF_LAST; nfield++)
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	651 {
311 ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	652 SIDLibSTILField *field = &subtune->fields[nfield];
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	653 for (int n = 0; n < field->ndata; n++)
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	654 th_free(field->data[n]);
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	655
311 ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	656 th_free(field->data);
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	657 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	658 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	659
260 4a3e8960b3a9 Rename some struct fields. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	660 th_free(node->subtunes);
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	661 th_free(node->filename);
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	662 th_free(node);
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	663 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	664 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	665
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	666
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	667 static int sidlib_stildb_node_new(SIDLibSTILNode *pnode, const char filename)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	668 {
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	669 // Allocate memory for new node
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	670 SIDLibSTILNode *node;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	671 int res;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	672
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	673 if ((node = pnode = (SIDLibSTILNode ) th_malloc0(sizeof(SIDLibSTILNode))) == NULL)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	674 return THERR_MALLOC;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	675
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	676 // Allocate filename and initial space for one subtune
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	677 if ((node->filename = th_strdup(filename)) == NULL)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	678 return THERR_MALLOC;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	679
264 5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	680 if ((res = sidlib_stildb_entry_realloc(node, 1, FALSE, -1, NULL)) != THERR_OK)
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	681 {
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	682 sidlib_stildb_node_free(node);
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	683 return res;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	684 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	685
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	686 return res;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	687 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	688
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	689
254 cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	690 /* Free a given STIL database
cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	691 */
cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	692 void sidlib_stildb_free(SIDLibSTILDB *dbh)
cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	693 {
cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	694 if (dbh != NULL)
cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	695 {
255 3c1cb0f39703 OOoops. Use th_llist_free_func_node() instead of th_llist_free_func(). Matti Hamalainen <ccr@tnsp.org> parents: 254 diff changeset	696 th_llist_free_func_node((th_llist_t *) dbh->nodes,
3c1cb0f39703 OOoops. Use th_llist_free_func_node() instead of th_llist_free_func(). Matti Hamalainen <ccr@tnsp.org> parents: 254 diff changeset	697 (void ()(th_llist_t )) sidlib_stildb_node_free);
254 cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	698
cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	699 dbh->nodes = NULL;
cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	700 dbh->nnodes = 0;
cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	701
cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	702 th_free_r(&dbh->pindex);
cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	703 th_free(dbh);
cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	704 }
cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	705 }
cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	706
cc6d8d47dbc2 More sidlib_stildb_free() to more logical position in the source. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	707
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	708 /* Read database (additively) to given db-structure
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	709 */
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	710 enum
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	711 {
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	712 PM_EOF,
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	713 PM_ERROR,
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	714 PM_IDLE,
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	715 PM_COMMENT,
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	716 PM_NEXT,
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	717 PM_ENTRY,
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	718 PM_FIELD_NAME,
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	719 PM_FIELD_DATA,
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	720 PM_SUBTUNE,
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	721
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	722 PM_LAST
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	723 };
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	724
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	725
266 254828e9213b Make sidlib_stil_fields[] public. Matti Hamalainen <ccr@tnsp.org> parents: 265 diff changeset	726 const char *sidlib_stil_fields[STF_LAST] =
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	727 {
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	728 "NAME",
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	729 "AUTHOR",
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	730 "TITLE",
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	731 "INFO",
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	732 "ARTIST",
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	733 "COMMENT",
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	734
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	735 // STF_LAST
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	736 };
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	737
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	738
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	739 typedef struct
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	740 {
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	741 size_t lineNum;
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	742 ssize_t linePos;
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	743 int ch, prevMode, nextMode, parseMode;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	744 BOOL lineStart;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	745 } SIDLibSTILParserCtx;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	746
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	747
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	748 static int sidlib_stildb_get_field(const char *name)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	749 {
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	750 for (int n = 0; n < STF_LAST; n++)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	751 {
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	752 if (strcmp(sidlib_stil_fields[n], name) == 0)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	753 return n;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	754 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	755
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	756 return -1;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	757 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	758
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	759
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	760 static void sidlib_stildb_set_parsemode(SIDLibSTILParserCtx *ctx, const int mode)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	761 {
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	762 ctx->prevMode = ctx->parseMode;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	763 ctx->parseMode = mode;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	764 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	765
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	766
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	767 static void sidlib_stildb_set_next_parsemode(SIDLibSTILParserCtx *ctx, const int mode)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	768 {
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	769 sidlib_stildb_set_parsemode(ctx, PM_NEXT);
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	770 ctx->nextMode = mode;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	771 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	772
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	773
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	774 #define VADDCH(ch) if (strPos < SIDLIB_BUFFER_SIZE) { tmpStr[strPos++] = ch; }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	775
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	776
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	777 int sidlib_stildb_read(th_ioctx fh, SIDLibSTILDB dbh)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	778 {
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	779 int ret = THERR_OK, field = -1;
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	780 SIDLibSTILParserCtx ctx;
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	781 char tmpStr = NULL, fieldName = NULL;
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	782 size_t strPos;
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	783 SIDLibSTILNode *entry = NULL;
249 1f1e7934ae61 Few improvements to validity checking of STIL file parsing. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	784 int subtune;
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	785
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	786 if (fh == NULL \|\| dbh == NULL)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	787 return THERR_NULLPTR;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	788
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	789 if ((tmpStr = th_malloc(SIDLIB_BUFFER_SIZE + 1)) == NULL)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	790 return THERR_MALLOC;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	791
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	792 // Initialize values
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	793 memset(&ctx, 0, sizeof(ctx));
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	794 ctx.nextMode = ctx.prevMode = ctx.parseMode = PM_IDLE;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	795 ctx.ch = -1;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	796 ctx.lineStart = TRUE;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	797 strPos = 0;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	798
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	799 // Parse the STIL database
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	800 while (ctx.parseMode != PM_EOF && ctx.parseMode != PM_ERROR)
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	801 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	802 if (ctx.ch == -1)
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	803 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	804 // Get next character
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	805 switch (ctx.ch = thfgetc(fh))
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	806 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	807 case '\n':
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	808 fh->line++;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	809 ctx.linePos = -1;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	810 break;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	811
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	812 default:
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	813 if (ctx.linePos < 0)
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	814 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	815 ctx.lineStart = TRUE;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	816 ctx.linePos = 0;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	817 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	818 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	819 ctx.linePos++;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	820 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	821 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	822
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	823 switch (ctx.parseMode)
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	824 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	825 case PM_COMMENT:
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	826 // Comment parsing mode
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	827 if (ctx.ch == '\n')
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	828 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	829 // End of line, end of comment
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	830 sidlib_stildb_set_parsemode(&ctx, ctx.prevMode);
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	831 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	832 ctx.ch = -1;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	833 break;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	834
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	835 case PM_NEXT:
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	836 case PM_IDLE:
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	837 // Normal parsing mode
261 39a03560163d Improve STIL parsing reliability. Matti Hamalainen <ccr@tnsp.org> parents: 260 diff changeset	838 if (ctx.ch == EOF)
39a03560163d Improve STIL parsing reliability. Matti Hamalainen <ccr@tnsp.org> parents: 260 diff changeset	839 {
39a03560163d Improve STIL parsing reliability. Matti Hamalainen <ccr@tnsp.org> parents: 260 diff changeset	840 sidlib_stildb_set_parsemode(&ctx, PM_EOF);
39a03560163d Improve STIL parsing reliability. Matti Hamalainen <ccr@tnsp.org> parents: 260 diff changeset	841 }
39a03560163d Improve STIL parsing reliability. Matti Hamalainen <ccr@tnsp.org> parents: 260 diff changeset	842 else
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	843 if (ctx.ch == '#')
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	844 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	845 sidlib_stildb_set_parsemode(&ctx, PM_COMMENT);
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	846 ctx.ch = -1;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	847 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	848 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	849 if (th_iscrlf(ctx.ch) \|\| th_isspace(ctx.ch))
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	850 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	851 ctx.ch = -1;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	852 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	853 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	854 if (ctx.parseMode == PM_IDLE)
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	855 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	856 // PM_IDLE
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	857 strPos = 0;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	858 if (ctx.ch == '/')
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	859 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	860 sidlib_stildb_set_parsemode(&ctx, PM_ENTRY);
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	861 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	862 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	863 if (ctx.ch == '(')
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	864 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	865 sidlib_stildb_set_parsemode(&ctx, PM_SUBTUNE);
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	866 ctx.ch = -1;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	867 ctx.lineStart = TRUE;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	868 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	869 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	870 if (th_isalpha(ctx.ch))
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	871 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	872 sidlib_stildb_set_parsemode(&ctx, PM_FIELD_NAME);
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	873 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	874 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	875 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	876 // Error! Invalid character found
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	877 ret = th_io_error(fh, THERR_INVALID_DATA,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	878 "Unexpected character '%c'.",
05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	879 ctx.ch);
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	880 goto out;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	881 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	882 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	883 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	884 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	885 // PM_NEXT - Next item found
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	886 sidlib_stildb_set_parsemode(&ctx, ctx.nextMode);
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	887 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	888 break;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	889
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	890 case PM_ENTRY:
261 39a03560163d Improve STIL parsing reliability. Matti Hamalainen <ccr@tnsp.org> parents: 260 diff changeset	891 if (ctx.ch == EOF \|\| th_iscrlf(ctx.ch) \|\| th_isspace(ctx.ch))
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	892 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	893 // A new file / entry, allocate and append
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	894 tmpStr[strPos] = 0;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	895
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	896 if ((ret = sidlib_stildb_node_new(&entry, tmpStr)) != THERR_OK)
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	897 goto out;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	898
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	899 th_llist_append_node((th_llist_t *) &dbh->nodes, (th_llist_t ) entry);
249 1f1e7934ae61 Few improvements to validity checking of STIL file parsing. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	900
1f1e7934ae61 Few improvements to validity checking of STIL file parsing. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	901 // Default subtune is 0, for "main tune" information
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	902 subtune = 0;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	903
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	904 sidlib_stildb_set_parsemode(&ctx, PM_IDLE);
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	905 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	906 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	907 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	908 VADDCH(ctx.ch)
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	909 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	910 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	911 ret = th_io_error(fh, THERR_INVALID_DATA,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	912 "STIL entry filename too long.");
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	913 goto out;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	914 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	915 ctx.ch = -1;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	916 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	917 break;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	918
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	919 case PM_SUBTUNE:
261 39a03560163d Improve STIL parsing reliability. Matti Hamalainen <ccr@tnsp.org> parents: 260 diff changeset	920 if (ctx.ch == EOF \|\| ctx.ch == ')')
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	921 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	922 BOOL neg = FALSE;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	923
249 1f1e7934ae61 Few improvements to validity checking of STIL file parsing. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	924 // Subtune indicator end
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	925 tmpStr[strPos] = 0;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	926
249 1f1e7934ae61 Few improvements to validity checking of STIL file parsing. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	927 if (!th_get_int(tmpStr, (unsigned int *) &subtune, &neg) \|\| neg)
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	928 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	929 ret = th_io_error(fh, THERR_INVALID_DATA,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	930 "Entry '%s' subtune indicator '%s' is not a valid integer.",
05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	931 entry->filename, tmpStr);
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	932 goto out;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	933 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	934
253 c98be346c706 Check for subtune <= 0 instead of == 0. Matti Hamalainen <ccr@tnsp.org> parents: 249 diff changeset	935 if (subtune <= 0 \|\| subtune > 128)
249 1f1e7934ae61 Few improvements to validity checking of STIL file parsing. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	936 {
1f1e7934ae61 Few improvements to validity checking of STIL file parsing. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	937 th_io_error(fh, THERR_INVALID_DATA,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	938 "Entry '%s' subtune number #%d is out of range/invalid.",
05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	939 entry->filename, subtune);
249 1f1e7934ae61 Few improvements to validity checking of STIL file parsing. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	940
1f1e7934ae61 Few improvements to validity checking of STIL file parsing. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	941 subtune = -1;
1f1e7934ae61 Few improvements to validity checking of STIL file parsing. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	942 }
1f1e7934ae61 Few improvements to validity checking of STIL file parsing. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	943
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	944 sidlib_stildb_set_parsemode(&ctx, PM_IDLE);
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	945 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	946 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	947 if (th_isdigit(ctx.ch))
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	948 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	949 if (ctx.lineStart)
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	950 goto sub_unexpected;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	951
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	952 VADDCH(ctx.ch)
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	953 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	954 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	955 ret = th_io_error(fh, THERR_INVALID_DATA,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	956 "Subtune indicator too long.");
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	957 goto out;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	958 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	959 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	960 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	961 if ((ctx.ch == '#' && strPos > 0) \|\| (ctx.ch != '#' && !th_isspace(ctx.ch)))
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	962 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	963 sub_unexpected:
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	964 ret = th_io_error(fh, THERR_INVALID_DATA,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	965 "Unexpected character '%c' in subtune indicator.",
05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	966 ctx.ch);
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	967 goto out;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	968 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	969
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	970 ctx.ch = -1;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	971 ctx.lineStart = FALSE;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	972 break;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	973
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	974 case PM_FIELD_NAME:
261 39a03560163d Improve STIL parsing reliability. Matti Hamalainen <ccr@tnsp.org> parents: 260 diff changeset	975 if (ctx.ch == EOF \|\| ctx.ch == ':' \|\| th_iscrlf(ctx.ch) \|\| th_isspace(ctx.ch))
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	976 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	977 tmpStr[strPos] = 0;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	978 th_pstr_cpy(&fieldName, tmpStr);
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	979
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	980 field = sidlib_stildb_get_field(tmpStr);
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	981
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	982 if (entry == NULL)
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	983 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	984 ret = th_io_error(fh, THERR_INVALID_DATA,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	985 "No STIL entry allocated, but field '%s' found.",
05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	986 fieldName);
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	987 goto out;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	988 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	989
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	990 sidlib_stildb_set_next_parsemode(&ctx, PM_FIELD_DATA);
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	991 ctx.lineStart = FALSE;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	992 strPos = 0;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	993 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	994 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	995 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	996 VADDCH(ctx.ch)
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	997 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	998 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	999 ret = th_io_error(fh, THERR_INVALID_DATA,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	1000 "Field name too long.");
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1001 goto out;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1002 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1003 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1004
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1005 ctx.ch = -1;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1006 break;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1007
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1008 case PM_FIELD_DATA:
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1009 if (ctx.lineStart && th_isspace(ctx.ch) && ctx.linePos < 8)
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1010 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1011 ctx.ch = -1;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1012 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1013 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1014 if (th_iscrlf(ctx.ch))
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1015 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1016 ctx.lineStart = TRUE;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1017 ctx.ch = -1;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1018 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1019 else
261 39a03560163d Improve STIL parsing reliability. Matti Hamalainen <ccr@tnsp.org> parents: 260 diff changeset	1020 if (ctx.ch == EOF \|\| (ctx.lineStart && ctx.linePos < 8))
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1021 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1022 // Field done
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1023 tmpStr[strPos] = 0;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1024
249 1f1e7934ae61 Few improvements to validity checking of STIL file parsing. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	1025 if (field >= 0 && subtune >= 0)
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1026 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1027 // Supported field, add it
264 5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	1028 if ((ret = sidlib_stildb_entry_realloc(
5afa6052f796 Change SIDLibSTILSubTune::fields to new SIDLibSTILField structure for Matti Hamalainen <ccr@tnsp.org> parents: 263 diff changeset	1029 entry, subtune, TRUE, field, tmpStr)) != THERR_OK)
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1030 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1031 ret = th_io_error(fh, THERR_MALLOC,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	1032 "Could not allocate memory for field '%s'.",
05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	1033 fieldName);
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1034 goto out;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1035 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1036 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1037
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1038 sidlib_stildb_set_parsemode(&ctx, PM_IDLE);
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1039 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1040 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1041 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1042 ctx.lineStart = FALSE;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1043 VADDCH(ctx.ch)
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1044 else
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1045 {
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1046 ret = th_io_error(fh, THERR_INVALID_DATA,
265 05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	1047 "Field '%s' data too long.",
05bbe428a0ab Unify SIDLib error messages. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	1048 fieldName);
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1049 goto out;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1050 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1051 ctx.ch = - 1;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1052 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1053 break;
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1054 }
537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1055 }
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1056
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1057 out:
261 39a03560163d Improve STIL parsing reliability. Matti Hamalainen <ccr@tnsp.org> parents: 260 diff changeset	1058
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1059 th_free(tmpStr);
242 537420ccd05b More work on STIL parser. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	1060 th_free(fieldName);
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1061
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1062 if (ret == THERR_OK && ctx.parseMode == PM_ERROR)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1063 ret = THERR_INVALID_DATA;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1064
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1065 return ret;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1066 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1067
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1068
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1069 /* Compare two nodes
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1070 */
311 ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1071 static int sidlib_stildb_compare_subtunes(const void node1, const void node2)
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1072 {
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1073 return
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1074 ((SIDLibSTILSubTune ) node1)->tune - ((SIDLibSTILSubTune ) node2)->tune;
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1075 }
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1076
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1077
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1078 static int sidlib_stildb_compare_nodes(const void node1, const void node2)
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1079 {
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1080 // We assume here that we never ever get NULL-pointers or similar
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1081 return strcmp(
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1082 ((SIDLibSTILNode *) node1)->filename,
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1083 ((SIDLibSTILNode *) node2)->filename);
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1084 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1085
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1086
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1087 /* (Re)create index
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1088 */
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1089 int sidlib_stildb_build_index(SIDLibSTILDB *dbh)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1090 {
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1091 if (dbh == NULL)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1092 return THERR_NULLPTR;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1093
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1094 // Free old index
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1095 th_free_r(&(dbh->pindex));
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1096
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1097 // Get size of db
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1098 dbh->nnodes = th_llist_length((th_llist_t *) dbh->nodes);
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1099
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1100 // Check number of nodes
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1101 if (dbh->nnodes > 0)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1102 {
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1103 SIDLibSTILNode *node;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1104 size_t i;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1105
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1106 // XXX TODO Check number of nodes?
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1107
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1108 // Allocate memory for index-table
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1109 dbh->pindex = (SIDLibSTILNode *) th_malloc(sizeof(SIDLibSTILNode ) * dbh->nnodes);
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1110 if (dbh->pindex == NULL)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1111 return THERR_MALLOC;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1112
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1113 // Get node-pointers to table
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1114 for (i = 0, node = dbh->nodes; node != NULL && i < dbh->nnodes;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1115 node = (SIDLibSTILNode *) node->node.next)
311 ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1116 {
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1117 dbh->pindex[i++] = node;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1118
311 ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1119 // Sort the subtunes
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1120 qsort(node->subtunes, node->nsubtunes, sizeof(SIDLibSTILSubTune), sidlib_stildb_compare_subtunes);
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1121 }
ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1122
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1123 // Sort the indexes
311 ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1124 qsort(dbh->pindex, dbh->nnodes, sizeof(SIDLibSTILNode *), sidlib_stildb_compare_nodes);
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1125 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1126
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1127 return THERR_OK;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1128 }
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1129
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1130
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1131 /* Get STIL information node from database
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1132 */
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1133 SIDLibSTILNode sidlib_stildb_get_node(SIDLibSTILDB dbh, const char *filename)
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1134 {
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1135 SIDLibSTILNode keyItem, key, *item;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1136
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1137 keyItem.filename = (char *) filename;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1138 key = &keyItem;
311 ee56f1f2b528 Change how the STIL subtune are handled internally. Also fix a bug that Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1139 item = bsearch(&key, dbh->pindex, dbh->nnodes, sizeof(SIDLibSTILNode *), sidlib_stildb_compare_nodes);
241 c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1140
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1141 return item != NULL ? *item : NULL;
c9b57c8fd058 Begin work on STIL database parsing and handling. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	1142 }

Mercurial > hg > sidinfo

annotate sidlib.c @ 312:1950bb04a69b