Fix wavtrim not working correctly on PPC.

Don't rely on the host being little endian -- PPC Macs are not, resulting in
wavtrim not trimming files at all. Also fix a printf warning while at it.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25158 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 6 insertions, 3 deletions

diff --git a/tools/wavtrim.c b/tools/wavtrim.c
index b82f270c8d..8517b4677e 100644
--- a/tools/wavtrim.c
+++ b/tools/wavtrim.c
@@ -167,7 +167,9 @@ int wavtrim(char * filename, int maxsilence ,char* errstring,int errsize)
         /* clip the start */
         for (i=0; i<datalen; i+=2)
         {
-            sample16 = *(short *)(databuf + i);
+            /* samples are little endian */
+            sample16 = (*(databuf + i + 1) << 8) | *(databuf + i);
+
             if (abs(sample16) > max_silence)
                 break;
         }
@@ -178,7 +180,8 @@ int wavtrim(char * filename, int maxsilence ,char* errstring,int errsize)
         /* clip the end */
         for (i=datalen-2; i>skip_head; i-=2)
         {
-            sample16 = *(short *)(databuf + i);
+            /* samples are little endian */
+            sample16 = (*(databuf + i + 1) << 8) | *(databuf + i);
             if (abs(sample16) > max_silence)
                 break;
         }
@@ -231,7 +234,7 @@ int main (int argc, char** argv)
     ret = wavtrim(argv[1],max_silence,errbuffer,255 ); 
     if( ret< 0)
     {
-        printf(errbuffer);
+        printf("%s", errbuffer);
     }
     return ret;
 }