# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1349177147 -10800
# Node ID aa9fbdbcea70e152abde6af0249f3b717a60091c
# Parent  baf72a99d5eebdb4bb1166352e1ca46a043bbd34
Cleanups.

diff -r baf72a99d5ee -r aa9fbdbcea70 jloadxm.c
--- a/jloadxm.c	Tue Oct 02 10:50:44 2012 +0300
+++ b/jloadxm.c	Tue Oct 02 14:25:47 2012 +0300
@@ -581,7 +581,7 @@
         remainder = xmI1.headSize - (dmftell(inFile) - pos);
         if (remainder > 0)
         {
-            JSSDEBUG("PPM! Skipping: %li\n", remainder);
+            JSSDEBUG("Skipping: %li\n", remainder);
             dmfseek(inFile, remainder, SEEK_CUR);
         }
     }
@@ -722,7 +722,7 @@
      */
     for (index = 0; index < module->npatterns; index++)
     {
-        off_t pos;
+        off_t pos, remainder;
         XMPattern xmP;
 
         // Get the pattern header
@@ -757,9 +757,11 @@
         }
 
         // Skip extra data (if the file is damaged)
-        if (xmP.size > dmftell(inFile) - pos)
+        remainder = xmP.headSize - (dmftell(inFile) - pos);
+        if (remainder > 0)
         {
-            dmfseek(inFile, dmftell(inFile) - pos, SEEK_CUR);
+            JSSDEBUG("Skipping: %li\n", remainder);
+            dmfseek(inFile, remainder, SEEK_CUR);
         }
     }