# HG changeset patch
# User Yoshiki Yazawa <yaz@cc.rim.or.jp>
# Date 1197884135 -32400
# Node ID 224ebe9caaac9b0c8568f68f0c0f22a549c667db
# Parent  240bdf781ad0000cb8d8ecdb8a86a09747c856a5
eliminate warnings

diff -r 240bdf781ad0 -r 224ebe9caaac src/adplug/adplug-xmms.cc
--- a/src/adplug/adplug-xmms.cc	Mon Dec 17 18:04:53 2007 +0900
+++ b/src/adplug/adplug-xmms.cc	Mon Dec 17 18:35:35 2007 +0900
@@ -139,6 +139,7 @@
   return GTK_WIDGET (label);
 }
 
+#if 0
 static void
 MessageBox (const char *title, const char *text, const char *button)
 {
@@ -158,6 +159,7 @@
   free (tmptxt);
   free (tmpbutton);
 }
+#endif
 
 /***** Dialog boxes *****/
 
diff -r 240bdf781ad0 -r 224ebe9caaac src/adplug/core/dmo.cxx
--- a/src/adplug/core/dmo.cxx	Mon Dec 17 18:04:53 2007 +0900
+++ b/src/adplug/core/dmo.cxx	Mon Dec 17 18:35:35 2007 +0900
@@ -349,8 +349,10 @@
       if (opos + cx >= oend)
         return -1;
 
-      for (int i = 0; i < cx; i++)
-        *opos++ = *(opos - ax);
+      for (int i = 0; i < cx; i++) {
+        *opos = *(opos - ax);
+        opos++;
+      }
 
       continue;
     }
@@ -370,8 +372,10 @@
       if (opos + bx + cx >= oend)
         return -1;
 
-      for (i = 0; i < cx; i++)
-        *opos++ = *(opos - ax);
+      for (i = 0; i < cx; i++) {
+        *opos = *(opos - ax);
+        opos++;
+      }
 
       for (i = 0; i < bx; i++)
         *opos++ = *ipos++;
@@ -395,8 +399,10 @@
       if (opos + ax + cx >= oend)
         return -1;
 
-      for (i = 0; i < cx; i++)
-        *opos++ = *(opos - bx);
+      for (i = 0; i < cx; i++) {
+        *opos = *(opos - bx);
+        opos++;
+      }
 
       for (i = 0; i < ax; i++)
         *opos++ = *ipos++;
diff -r 240bdf781ad0 -r 224ebe9caaac src/adplug/core/jbm.cxx
--- a/src/adplug/core/jbm.cxx	Mon Dec 17 18:04:53 2007 +0900
+++ b/src/adplug/core/jbm.cxx	Mon Dec 17 18:35:35 2007 +0900
@@ -75,7 +75,7 @@
   // Allocate memory buffer m[] and read entire file into it
 
   m = new unsigned char[filelen];
-  if (f->readString((char *)m, filelen) != filelen) goto loaderr;
+  if (f->readString((char *)m, filelen) != (unsigned int)filelen) goto loaderr;
 
   fp.close(f);