Mercurial > hg > xmms-sid
changeset 972:74ca6fb979fd dev-0_8_99_1
Cleanups.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 21 Nov 2012 00:16:25 +0200 |
parents | 3edc4c508f99 |
children | f5f383a55cb5 |
files | src/xs_length.c |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xs_length.c Wed Nov 21 00:16:20 2012 +0200 +++ b/src/xs_length.c Wed Nov 21 00:16:25 2012 +0200 @@ -398,8 +398,8 @@ goto error; } - if ((strncmp(psidH.magicID, "PSID", 4) && - strncmp(psidH.magicID, "RSID", 4)) || + if ((psidH.magic[0] != 'R' && psidH.magic[0] != 'P') || + psidH.magic[1] != 'S' || psidH.magic[2] != 'I' || psidH.magic[3] != 'D' || psidH.version < 1 || psidH.version > 3) { xs_error("Not a supported PSID or RSID file '%s'\n", filename); @@ -419,7 +419,7 @@ /* Check if we need to load PSIDv2NG header ... */ psidH2.flags = 0; /* Just silence a stupid gcc warning */ - if (psidH.version == 2 || psidH.version == 3) + if (psidH.version >= 2) { /* Yes, we need to */ if (!xs_fread_be16(inFile, &psidH2.flags) || @@ -490,7 +490,7 @@ xs_md5_append(&inState, &i8, sizeof(i8)); /* PSIDv2NG specific */ - if (psidH.version == 2 || psidH.version == 3) + if (psidH.version >= 2) { /* SEE SIDPLAY HEADERS FOR INFO */ i8 = (psidH2.flags >> 2) & 3;