--- a/minijss/jloadxm.c	Wed Apr 29 01:26:13 2020 +0300
+++ b/minijss/jloadxm.c	Wed Apr 29 01:31:20 2020 +0300
@@ -116,7 +116,7 @@
 
 /* Convert XM note value to internal JSS note
  */
-static int jssXMConvertNote(int val)
+static int jssXMConvertNote(const int val)
 {
     if (val < 1 || val > 97)
         return jsetNotSet;
@@ -132,14 +132,10 @@
  */
 static int jssXMUnpackPattern104(DMResource *inFile, int size, JSSPattern *pattern)
 {
-    JSSNote *pnote;
-    int row, channel;
-    assert(pattern != NULL);
+    JSSNote *pnote = pattern->data;
 
-    pnote = pattern->data;
-
-    for (row = 0; row < pattern->nrows && size > 0; row++)
-    for (channel = 0; channel < pattern->nchannels && size > 0; channel++)
+    for (int row = 0; row < pattern->nrows && size > 0; row++)
+    for (int channel = 0; channel < pattern->nchannels && size > 0; channel++)
     {
         int packb, tmp;
         JSGETBYTE(packb);
@@ -220,14 +216,10 @@
 
 static int jssXMUnpackPattern102(DMResource *inFile, int size, JSSPattern *pattern)
 {
-    JSSNote *pnote;
-    int row, channel;
-    assert(pattern != NULL);
+    JSSNote *pnote = pattern->data;
 
-    pnote = pattern->data;
-
-    for (row = 0; row < pattern->nrows && size > 0; row++)
-    for (channel = 0; channel < pattern->nchannels && size > 0; channel++)
+    for (int row = 0; row < pattern->nrows && size > 0; row++)
+    for (int channel = 0; channel < pattern->nchannels && size > 0; channel++)
     {
         int packb, tmp;
         JSGETBYTE(packb);
@@ -314,13 +306,13 @@
 
 static int jssXMLoadPatterns(DMResource *inFile, JSSModule *module, XMHeader *xmH)
 {
-    int index, ret;
-    XMPattern xmP;
-
-    for (index = 0; index < module->npatterns; index++)
+    for (int index = 0; index < module->npatterns; index++)
     {
+        XMPattern xmP;
         off_t remainder, pos = dmftell(inFile);
         Uint32 headSize = 0;
+        BOOL ret = FALSE;
+        int res;
 
         // Get the pattern header size and packing
         if (!dmf_read_le32(inFile, &xmP.headSize) ||
@@ -390,15 +382,15 @@
             switch (module->intVersion)
             {
                 case 0x0104:
-                    ret = jssXMUnpackPattern104(inFile, xmP.size, module->patterns[index]);
+                    res = jssXMUnpackPattern104(inFile, xmP.size, module->patterns[index]);
                     break;
                 case 0x0102:
-                    ret = jssXMUnpackPattern102(inFile, xmP.size, module->patterns[index]);
+                    res = jssXMUnpackPattern102(inFile, xmP.size, module->patterns[index]);
                     break;
             }
 
-            if (ret != 0)
-                JSSERROR(ret, ret, "Error in unpacking pattern #%d data\n", index);
+            if (res != DMERR_OK)
+                JSSERROR(res, res, "Error in unpacking pattern #%d data\n", index);
         }
 
         // Skip extra data if there is any .. shouldn't usually happen tho.
@@ -416,7 +408,7 @@
     /* Convert song orders list by replacing nonexisting
      * pattern numbers with pattern number jsetMaxPatterns.
      */
-    for (index = 0; index < module->norders; index++)
+    for (int index = 0; index < module->norders; index++)
     {
         int tmp = xmH->orderList[index];
         if (tmp >= module->npatterns ||
@@ -436,12 +428,11 @@
     JSSEnvelope *dst, XMEnvelope *src,
     const char *name, const int ninstr)
 {
-    int i;
     (void) name;
     (void) ninstr;
 
     // Convert envelope points
-    for (i = 0; i < XM_MaxEnvPoints; i++)
+    for (int i = 0; i < XM_MaxEnvPoints; i++)
     {
         dst->points[i].frame = src->points[i].frame;
         dst->points[i].value = src->points[i].value;
@@ -670,7 +661,7 @@
     }
 
     // Read sampledata
-    if (dmfread(inst->data, sizeof(Uint8), bsize, inFile) != bsize)
+    if (!dmf_read_str(inFile, inst->data, bsize))
     {
         JSSERROR(DMERR_FREAD, DMERR_FREAD,
             "Error reading sample data for instrument #%d/%d, %d bytes.\n",