# HG changeset patch # User Matti Hamalainen # Date 1425563904 -7200 # Node ID 4d27c4ec8d4d4bd466940622f167a750799156e9 # Parent 1f2cfa0119aa2a12fe85c7f619d60c681b8e7f59 Use %d instead of %i in formats. diff -r 1f2cfa0119aa -r 4d27c4ec8d4d tools/xm2jss.c --- a/tools/xm2jss.c Thu Mar 05 15:58:12 2015 +0200 +++ b/tools/xm2jss.c Thu Mar 05 15:58:24 2015 +0200 @@ -434,7 +434,7 @@ if (m->nchannels < 1 || m->npatterns < 1 || m->norders < 1) JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, - "Module had invalid values (nchannels=%i, npatterns=%i, norders=%i)\n", + "Module had invalid values (nchannels=%d, npatterns=%d, norders=%d)\n", m->nchannels, m->npatterns, m->norders); // Create the JSSMOD header @@ -510,7 +510,7 @@ if (i != DMERR_OK) { dmFree(patBuf); - JSSERROR(i, i, "Error converting pattern data #%i\n", pattern); + JSSERROR(i, i, "Error converting pattern data #%d\n", pattern); } else { @@ -562,13 +562,13 @@ jssE.vibratoDepth = einst->vibratoDepth; jssE.fadeOut = einst->fadeOut; } else - JSSWARNING(DMERR_NULLPTR, DMERR_NULLPTR, "Extended instrument #%i NULL!\n", instr); + JSSWARNING(DMERR_NULLPTR, DMERR_NULLPTR, "Extended instrument #%d NULL!\n", instr); // Write to file totalSize += sizeof(jssE); if (fwrite(&jssE, sizeof(jssE), 1, outFile) != 1) JSSERROR(DMERR_FWRITE, DMERR_FWRITE, - "Could not write JSSMOD extended instrument #%i to file!\n", instr); + "Could not write JSSMOD extended instrument #%d to file!\n", instr); } dmMsg(1," * %d Extended Instruments, %d bytes.\n", m->nextInstruments, totalSize); @@ -597,13 +597,13 @@ jssI.convFlags = (inst->flags & jsf16bit) ? flags16 : flags8; } else - JSSWARNING(DMERR_NULLPTR, DMERR_NULLPTR, "Instrument #%i NULL!\n", instr); + JSSWARNING(DMERR_NULLPTR, DMERR_NULLPTR, "Instrument #%d NULL!\n", instr); // Write to file totalSize += sizeof(jssI); if (fwrite(&jssI, sizeof(jssI), 1, outFile) != 1) JSSERROR(DMERR_FWRITE, DMERR_FWRITE, - "Could not write JSSMOD instrument #%i to file!\n", instr); + "Could not write JSSMOD instrument #%d to file!\n", instr); } dmMsg(1," * %d Instrument headers, %d bytes.\n", m->ninstruments, totalSize); @@ -629,7 +629,7 @@ totalSize += inst->size; if (res != (size_t) inst->size) JSSERROR(DMERR_FWRITE, DMERR_FWRITE, - "Could not write JSSMOD sample #%i to file!\n", instr); + "Could not write JSSMOD sample #%d to file!\n", instr); } } dmMsg(1," * %d samples, %d bytes.\n", m->ninstruments, totalSize); @@ -996,7 +996,7 @@ dmf_close(inFile); if (result != 0) { - dmErrorMsg("Error while loading XM file (%i), ", result); + dmErrorMsg("Error while loading XM file (%d), ", result); if (optIgnoreErrors) fprintf(stderr, "ignoring. This may cause problems.\n"); else