# HG changeset patch # User Matti Hamalainen # Date 1137962882 0 # Node ID 7dc7e7dbbf901c68087a635115cd4c8e506d0a85 # Parent 7e35b6059d79013b7c60ad9ec8ef909ac31492b1 Indentation fixes. diff -r 7e35b6059d79 -r 7dc7e7dbbf90 src/xs_length.c --- a/src/xs_length.c Tue Dec 27 10:33:00 2005 +0000 +++ b/src/xs_length.c Sun Jan 22 20:48:02 2006 +0000 @@ -93,8 +93,9 @@ /* Get seconds-field */ (*piPos)++; iTemp = 0; - while (isdigit(pcStr[*piPos])) + while (isdigit(pcStr[*piPos])) { iTemp = (iTemp * 10) + (pcStr[(*piPos)++] - '0'); + } iResult += iTemp; } else @@ -289,7 +290,9 @@ static gint xs_sldb_cmp(const void *pNode1, const void *pNode2) { /* We assume here that we never ever get NULL-pointers or similar */ - return xs_sldb_cmphash((*(t_xs_sldb_node **) pNode1)->md5Hash, (*(t_xs_sldb_node **) pNode2)->md5Hash); + return xs_sldb_cmphash( + (*(t_xs_sldb_node **) pNode1)->md5Hash, + (*(t_xs_sldb_node **) pNode2)->md5Hash); } @@ -375,12 +378,12 @@ { gchar magicID[4]; /* "PSID" / "RSID" magic identifier */ guint16 version, /* Version number */ - dataOffset, /* Start of actual c64 data in file */ - loadAddress, /* Loading address */ - initAddress, /* Initialization address */ - playAddress, /* Play one frame */ - nSongs, /* Number of subsongs */ - startSong; /* Default starting song */ + dataOffset, /* Start of actual c64 data in file */ + loadAddress, /* Loading address */ + initAddress, /* Initialization address */ + playAddress, /* Play one frame */ + nSongs, /* Number of subsongs */ + startSong; /* Default starting song */ guint32 speed; /* Speed */ gchar sidName[32]; /* Descriptive text-fields, ASCIIZ */ gchar sidAuthor[32]; @@ -443,6 +446,7 @@ psidH2.pageLength = fgetc(inFile); psidH2.reserved = xs_rd_be16(inFile); } + #ifdef XS_BUF_DYNAMIC /* Allocate buffer */ songData = (guint8 *) g_malloc(XS_SIDBUF_SIZE * sizeof(guint8)); @@ -458,6 +462,7 @@ /* Initialize and start MD5-hash calculation */ xs_md5_init(&inState); + if (psidH.loadAddress == 0) { /* Strip load address (2 first bytes) */ xs_md5_append(&inState, &songData[2], iRes - 2); @@ -466,7 +471,6 @@ xs_md5_append(&inState, songData, iRes); } - #ifdef XS_BUF_DYNAMIC /* Free buffer */ g_free(songData); @@ -476,11 +480,12 @@ #define XSADDHASH(QDATAB) { ib8[0] = (QDATAB & 0xff); ib8[1] = (QDATAB >> 8); xs_md5_append(&inState, (guint8 *) &ib8, sizeof(ib8)); } XSADDHASH(psidH.initAddress) - XSADDHASH(psidH.playAddress) - XSADDHASH(psidH.nSongs) + XSADDHASH(psidH.playAddress) + XSADDHASH(psidH.nSongs) #undef XSADDHASH - /* Append song speed data to hash */ - i8 = 0; + + /* Append song speed data to hash */ + i8 = 0; for (iIndex = 0; (iIndex < psidH.nSongs) && (iIndex < 32); iIndex++) { i8 = (psidH.speed & (1 << iIndex)) ? 60 : 0; xs_md5_append(&inState, &i8, sizeof(i8)); @@ -491,7 +496,6 @@ xs_md5_append(&inState, &i8, sizeof(i8)); } - /* PSIDv2NG specific */ if (psidH.version == 2) { /* SEE SIDPLAY HEADERS FOR INFO */