# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1425731844 -7200
# Node ID e44a2b7abe0734402128ddef0f573e98b5d19214
# Parent  5e2b90e3e4bc69c6420c0ccdf072b4871748821f
Cleanups.

diff -r 5e2b90e3e4bc -r e44a2b7abe07 tools/xm2jss.c
--- a/tools/xm2jss.c	Sat Mar 07 14:29:29 2015 +0200
+++ b/tools/xm2jss.c	Sat Mar 07 14:37:24 2015 +0200
@@ -513,15 +513,12 @@
 
     // Convert and write patterns
     for (totalSize = pattern = 0; pattern < m->npatterns; pattern++)
+    if (m->patterns[pattern] != NULL)
     {
         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",
@@ -575,42 +572,43 @@
             "Error writing pattern #%d data\n", pattern);
         }
     }
+    else
+        JSSERROR(DMERR_NULLPTR, DMERR_NULLPTR,
+        "Pattern #%d was NULL.\n", pattern);
+
     dmFree(patBuf);
     dmMsg(1," * %d patterns, %d bytes.\n", m->npatterns, totalSize);
 
     // Write extended instruments
     for (totalSize = instr = 0; instr < m->nextInstruments; instr++)
+    if (m->extInstruments[instr] != NULL)
     {
+        JSSExtInstrument *einst = m->extInstruments[instr];
         JSSMODExtInstrument jssE;
-        JSSExtInstrument *einst = m->extInstruments[instr];
 
         dmMemset(&jssE, 0, sizeof(jssE));
-
-        if (einst)
+        // Create header
+        jssE.nsamples = einst->nsamples;
+        for (i = 0; i < jsetNNotes; i++)
         {
-            // Create header
-            jssE.nsamples = einst->nsamples;
-            for (i = 0; i < jsetNNotes; i++)
-            {
-                int snum = einst->sNumForNotes[i];
-                jssE.sNumForNotes[i] = (snum != jsetNotSet) ? snum + 1: 0;
-            }
+            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;
-            jssE.vibratoSweep = einst->vibratoSweep;
-            jssE.vibratoDepth = einst->vibratoDepth;
-            jssE.fadeOut      = einst->fadeOut;
-        } else
-            JSSWARNING(DMERR_NULLPTR, DMERR_NULLPTR, "Extended instrument #%d NULL!\n", instr);
+        jssCopyEnvelope(&jssE.volumeEnv, &(einst->volumeEnv));
+        jssCopyEnvelope(&jssE.panningEnv, &(einst->panningEnv));
+        jssE.vibratoType  = einst->vibratoType;
+        jssE.vibratoSweep = einst->vibratoSweep;
+        jssE.vibratoDepth = einst->vibratoDepth;
+        jssE.fadeOut      = einst->fadeOut;
 
         // 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 #%d to file!\n", instr);
-    }
+    } else
+        JSSWARNING(DMERR_NULLPTR, DMERR_NULLPTR, "Extended instrument #%d NULL!\n", instr);
     dmMsg(1," * %d Extended Instruments, %d bytes.\n", m->nextInstruments, totalSize);