Mercurial > hg > xmms-sid

comparison src/xs_length.c @ 976:56368ab7d282

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 01 Dec 2012 11:03:46 +0200
parents 74ca6fb979fd
children
comparison
equal deleted inserted replaced
975:0664bfff1860 976:56368ab7d282
181 } 181 }
182 182
183 183
184 /* Read database to memory 184 /* Read database to memory
185 */ 185 */
186 gint xs_sldb_read(XSSLDB *db, const gchar *dbFilename) 186 gint xs_sldb_read(XSSLDB *db, const gchar *filename)
187 { 187 {
188 FILE *inFile; 188 FILE *inFile;
189 gchar inLine[XS_BUF2_SIZE]; 189 gchar inLine[XS_BUF2_SIZE];
190 size_t lineNum; 190 size_t lineNum;
191 XSSLDBNode *tmnode; 191 XSSLDBNode *tmnode;
192 assert(db); 192 assert(db);
193 193
194 /* Try to open the file */ 194 /* Try to open the file */
195 if ((inFile = fopen(dbFilename, "ra")) == NULL) 195 if ((inFile = fopen(filename, "ra")) == NULL)
196 { 196 {
197 xs_error("Could not open SongLengthDB '%s'\n", dbFilename); 197 xs_error("Could not open SongLengthDB '%s'\n", filename);
198 return -1; 198 return -1;
199 } 199 }
200 200
201 /* Read and parse the data */ 201 /* Read and parse the data */
202 lineNum = 0; 202 lineNum = 0;
216 for (hashLen = 0; inLine[linePos] && isxdigit(inLine[linePos]); hashLen++, linePos++); 216 for (hashLen = 0; inLine[linePos] && isxdigit(inLine[linePos]); hashLen++, linePos++);
217 217
218 if (hashLen != XS_MD5HASH_LENGTH_CH) 218 if (hashLen != XS_MD5HASH_LENGTH_CH)
219 { 219 {
220 xs_error("Invalid MD5-hash in SongLengthDB file '%s' line #%d:\n%s\n", 220 xs_error("Invalid MD5-hash in SongLengthDB file '%s' line #%d:\n%s\n",
221 dbFilename, lineNum, inLine); 221 filename, lineNum, inLine);
222 } 222 }
223 else 223 else
224 { 224 {
225 /* Parse and add node to db */ 225 /* Parse and add node to db */
226 if ((tmnode = xs_sldb_read_entry(inLine)) != NULL) 226 if ((tmnode = xs_sldb_read_entry(inLine)) != NULL)
228 xs_sldb_node_insert(db, tmnode); 228 xs_sldb_node_insert(db, tmnode);
229 } 229 }
230 else 230 else
231 { 231 {
232 xs_error("Invalid entry in SongLengthDB file '%s' line #%d:\n%s\n", 232 xs_error("Invalid entry in SongLengthDB file '%s' line #%d:\n%s\n",
233 dbFilename, lineNum, inLine); 233 filename, lineNum, inLine);
234 } 234 }
235 } 235 }
236 } 236 }
237 else 237 else
238 if (inLine[linePos] != ';' && inLine[linePos] != '[' && inLine[linePos] != 0) 238 if (inLine[linePos] != ';' && inLine[linePos] != '[' && inLine[linePos] != 0)
239 { 239 {
240 xs_error("Invalid line in SongLengthDB file '%s' line #%d:\n%s\n", 240 xs_error("Invalid line in SongLengthDB file '%s' line #%d:\n%s\n",
241 dbFilename, lineNum, inLine); 241 filename, lineNum, inLine);
242 } 242 }
243 } 243 }
244 244
245 fclose(inFile); 245 fclose(inFile);
246 return 0; 246 return 0;