--- a/tools/xm2jss.c	Fri Mar 06 13:38:53 2015 +0200
+++ b/tools/xm2jss.c	Fri Mar 06 13:40:47 2015 +0200
@@ -69,10 +69,10 @@
 
     printf("\n"
     "Pattern storage modes:\n");
-    
+
     for (i = 1; i < PATMODE_LAST; i++)
         printf("  %d = %s\n", i, patModeTable[i-1]);
-    
+
     printf(
     "\n"
     "Sample data conversion flags (summative):\n"
@@ -87,7 +87,7 @@
 BOOL argHandleOpt(const int optN, char *optArg, char *currArg)
 {
     (void) optArg;
-    
+
     switch (optN)
     {
     case 0:
@@ -125,7 +125,7 @@
         dmErrorMsg("Unknown argument '%s'.\n", currArg);
         return FALSE;
     }
-    
+
     return TRUE;
 }
 
@@ -143,7 +143,7 @@
         dmErrorMsg("Too many filename arguments specified, '%s'.\n", currArg);
         return FALSE;
     }
-    
+
     return TRUE;
 }
 
@@ -207,14 +207,14 @@
         JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, "Note value out of bounds %d > 0x7f.\n", tmp);
 
     JSPUTBYTE(tmp & 0x7f);
-    
+
     JSCONVPUT(pnote->instrument, "Instrument");
     JSCONVPUT(pnote->volume, "Volume");
     JSCONVPUT(pnote->effect, "Effect");
-    
+
     tmp = (pnote->param != jsetNotSet) ? pnote->param : 0;
     JSPUTBYTE(tmp);
-    
+
     return DMERR_OK;
 }
 
@@ -229,7 +229,7 @@
     int qcomp = 0;
 
     // Determine what would get stored,
-    // aka actually how much space we use    
+    // aka actually how much space we use
     JSCOMP(pnote->note,       JM_COMP_NOTE);
     JSCOMP(pnote->instrument, JM_COMP_INSTRUMENT);
     JSCOMP(pnote->volume,     JM_COMP_VOLUME);
@@ -239,12 +239,12 @@
         qflags |= JM_COMP_PARAM;
         qcomp++;
     }
-    
+
     if (qcomp < 4)
     {
         // Okay, it's less than 4 bytes, so use compressed
         JSPUTBYTE(qflags | 0x80);
-        
+
         if (pnote->note != jsetNotSet)
         {
             Uint8 tmp = (pnote->note != jsetNoteOff) ? pnote->note : 127;
@@ -252,7 +252,7 @@
                 JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, "Note value out of bounds %d > 0x7f.\n", tmp);
             JSPUTBYTE(tmp);
         }
-        
+
         JSCOMPPUT(JM_COMP_INSTRUMENT, pnote->instrument, "Instrument");
         JSCOMPPUT(JM_COMP_VOLUME, pnote->volume, "Volume");
         JSCOMPPUT(JM_COMP_EFFECT, pnote->effect, "Effect");
@@ -276,7 +276,7 @@
 {
     int row, channel;
     *patSize = 0;
-    
+
     for (row = 0; row < pattern->nrows; row++)
     for (channel = 0; channel < pattern->nchannels; channel++)
     {
@@ -289,7 +289,7 @@
             return res;
         }
     }
-    
+
     return DMERR_OK;
 }
 
@@ -300,7 +300,7 @@
 {
     int row, channel;
     *patSize = 0;
-    
+
     for (channel = 0; channel < pattern->nchannels; channel++)
     for (row = 0; row < pattern->nrows; row++)
     {
@@ -313,7 +313,7 @@
             return res;
         }
     }
-    
+
     return DMERR_OK;
 }
 
@@ -326,7 +326,7 @@
 {
     int row, channel;
     *patSize = 0;
-    
+
     for (row = 0; row < pattern->nrows; row++)
     for (channel = 0; channel < pattern->nchannels; channel++)
     {
@@ -339,7 +339,7 @@
             return res;
         }
     }
-    
+
     return DMERR_OK;
 }
 
@@ -350,7 +350,7 @@
 {
     int row, channel;
     *patSize = 0;
-    
+
     for (channel = 0; channel < pattern->nchannels; channel++)
     for (row = 0; row < pattern->nrows; row++)
     {
@@ -363,7 +363,7 @@
             return res;
         }
     }
-    
+
     return DMERR_OK;
 }
 
@@ -382,7 +382,7 @@
     Uint8 tmp;
     int row, channel;
     *patSize = 0;
-    
+
     JSFOREACHNOTE1;
     if (pnote->note == jsetNotSet)
         tmp = 0;
@@ -397,24 +397,24 @@
 
     JSPUTBYTE(tmp);
     JSFOREACHNOTE2;
-    
+
     JSFOREACHNOTE1;
     JSCONVPUT(pnote->instrument, "Instrument");
     JSFOREACHNOTE2;
-    
+
     JSFOREACHNOTE1;
     JSCONVPUT(pnote->volume, "Volume");
     JSFOREACHNOTE2;
-    
+
     JSFOREACHNOTE1;
     JSCONVPUT(pnote->effect, "Effect");
     JSFOREACHNOTE2;
-    
+
     JSFOREACHNOTE1;
     tmp = (pnote->param != jsetNotSet) ? pnote->param : 0;
     JSPUTBYTE(tmp);
     JSFOREACHNOTE2;
-    
+
     return DMERR_OK;
 }
 
@@ -425,13 +425,13 @@
 static void jssCopyEnvelope(JSSMODEnvelope *je, JSSEnvelope *e)
 {
     int i;
-    
+
     je->flags   = e->flags;
     je->npoints = e->npoints;
     je->sustain = e->sustain;
     je->loopS   = e->loopS;
     je->loopE   = e->loopE;
-    
+
     for (i = 0; i < e->npoints; i++)
     {
         je->points[i].frame = e->points[i].frame;
@@ -508,14 +508,16 @@
         JSSPattern *pat = m->patterns[pattern];
         JSSMODPattern patHead;
         size_t finalSize = 0;
-        
+
         if (pat == NULL)
             JSSERROR(DMERR_NULLPTR, DMERR_NULLPTR,
             "Pattern #%d was NULL.\n", pattern);
+
         if (pat->nrows > jsetMaxRows)
             JSSERROR(DMERR_INVALID_DATA, DMERR_INVALID_DATA,
             "Pattern #%d has %d rows > %d max.\n",
             pattern, pat->nrows, jsetMaxRows);
+
         switch (patMode)
         {
             case PATMODE_RAW_HORIZ:
@@ -572,7 +574,7 @@
     {
         JSSMODExtInstrument jssE;
         JSSExtInstrument *einst = m->extInstruments[instr];
-        
+
         dmMemset(&jssE, 0, sizeof(jssE));
 
         if (einst)
@@ -584,7 +586,7 @@
                 int snum = einst->sNumForNotes[i];
                 jssE.sNumForNotes[i] = (snum != jsetNotSet) ? snum + 1: 0;
             }
-            
+
             jssCopyEnvelope(&jssE.volumeEnv, &(einst->volumeEnv));
             jssCopyEnvelope(&jssE.panningEnv, &(einst->panningEnv));
             jssE.vibratoType  = einst->vibratoType;
@@ -593,7 +595,7 @@
             jssE.fadeOut      = einst->fadeOut;
         } else
             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)
@@ -626,9 +628,9 @@
             jssI.hasData      = (inst->data != NULL) ? TRUE : FALSE;
             jssI.convFlags    = (inst->flags & jsf16bit) ? flags16 : flags8;
         }
-        else 
+        else
             JSSWARNING(DMERR_NULLPTR, DMERR_NULLPTR, "Instrument #%d NULL!\n", instr);
-        
+
         // Write to file
         totalSize += sizeof(jssI);
         if (fwrite(&jssI, sizeof(jssI), 1, outFile) != 1)
@@ -636,7 +638,7 @@
              "Could not write JSSMOD instrument #%d to file!\n", instr);
     }
     dmMsg(1," * %d Instrument headers, %d bytes.\n", m->ninstruments, totalSize);
-    
+
     // Write sample data
     for (totalSize = instr = 0; instr < m->ninstruments; instr++)
     if (m->instruments[instr])
@@ -655,7 +657,7 @@
                 jssEncodeSample8(inst->data, inst->size, flags8);
                 res = fwrite(inst->data, sizeof(Uint8), inst->size, outFile);
             }
-            
+
             totalSize += inst->size;
             if (res != (size_t) inst->size)
                 JSSERROR(DMERR_FWRITE, DMERR_FWRITE,
@@ -663,7 +665,7 @@
         }
     }
     dmMsg(1," * %d samples, %d bytes.\n", m->ninstruments, totalSize);
-    
+
     return DMERR_OK;
 }
 
@@ -698,7 +700,7 @@
     r->norders          = m->norders;
     for (i = 0; i < jsetNChannels; i++)
         r->defPanning[i] = m->defPanning[i];
-    
+
     // Initialize values
     for (i = 0; i <= jsetMaxInstruments; i++)
     {
@@ -707,7 +709,7 @@
         mapExtInstruments[i]  = jsetNotSet;
         mapInstruments[i]     = jsetNotSet;
     }
-    
+
     for (i = 0; i <= jsetMaxPatterns; i++)
     {
         usedPatterns[i] = FALSE;
@@ -728,10 +730,10 @@
             {
                 int row, channel;
                 JSSNote *n = p->data;
-                
+
                 // Mark this pattern as used
                 usedPatterns[pattern] = TRUE;
-                
+
                 // Check all notes in this pattern to see what instruments are used
                 for (row = 0; row < p->nrows; row++)
                 for (channel = 0; channel < p->nchannels; channel++, n++)
@@ -760,12 +762,12 @@
         {
             dmErrorMsg("Order 0x%x has invalid pattern number 0x%x, changing to empty!\n",
                 i, pattern);
-            
+
             // Fix it.
             m->orderList[i] = jsetMaxPatterns;
         }
     }
-    
+
     //
     // Find used sample instruments
     //
@@ -812,7 +814,7 @@
             dmErrorMsg("Pattern 0x%x used but is NULL.\n", i);
             continue;
         }
-        
+
         mapPatterns[i] = r->npatterns;
         r->patterns[r->npatterns] = m->patterns[i];
         (r->npatterns)++;
@@ -823,8 +825,8 @@
 
     dmMsg(1, "%d used patterns (%d unused).\n",
         r->npatterns, unused);
-    
-    
+
+
     //
     // Re-map instruments
     //
@@ -867,7 +869,7 @@
     dmPrint(2, "\n");
     dmMsg(1, "Total of %d [16-bit] + %d [8-bit] samples = %d instruments (%d unused).\n",
         n16, n8, r->ninstruments, unused);
-    
+
     //
     // Re-map ext.instruments
     //
@@ -938,7 +940,7 @@
         int row, channel;
         JSSPattern *p = r->patterns[i];
         JSSNote *n = p->data;
-        
+
         for (row = 0; row < p->nrows; row++)
         for (channel = 0; channel < p->nchannels; channel++, n++)
         {
@@ -974,7 +976,7 @@
             }
         }
     }
-    
+
     //
     // Remap orders list
     //
@@ -1039,12 +1041,12 @@
     // Check stripping settings
     if (optStripExtInstr) optStripInstr = TRUE;
     if (optStripInstr) optStripSamples = TRUE;
-    
+
     // Remove samples
     if (optStripSamples)
     {
         int i;
-        
+
         dmMsg(1, "Stripping samples...\n");
         for (i = 0; i < sm->ninstruments; i++)
         {
@@ -1057,7 +1059,7 @@
     if (optStripInstr)
     {
         int i;
-        
+
         dmMsg(1, "Stripping instruments...\n");
         for (i = 0; i < sm->ninstruments; i++)
         {
@@ -1071,7 +1073,7 @@
     if (optStripExtInstr)
     {
         int i;
-        
+
         dmMsg(1, "Stripping ext.instruments...\n");
         for (i = 0; i < sm->nextInstruments; i++)
         {
@@ -1099,13 +1101,13 @@
 
     dmMsg(1, "Writing JSSMOD-format file [patMode=0x%04x, samp8=0x%02x, samp16=0x%02x]\n",
         optPatternMode, optSampMode8, optSampMode16);
-    
+
     result = jssSaveJSSMOD(outFile, dm, optPatternMode, optSampMode8, optSampMode16);
 
     dmFree(sm);
 
     fclose(outFile);
-    
+
     if (result != 0)
     {
         dmErrorMsg(