From a7f6a75da311ec6a9e96a60910a6b0c2c3e422d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Mon, 5 Sep 2011 20:35:52 +0300
Subject: [PATCH] Fix a few debug messages

---
 modules/access/http.c     |  5 +----
 modules/codec/quicktime.c |  2 +-
 modules/codec/svcdsub.c   | 24 +++++++++++-------------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/modules/access/http.c b/modules/access/http.c
index c4cb7f3980..700cccd227 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -490,14 +490,11 @@ connect:
             if( !vlc_object_alive (p_access) || Connect( p_access, 0 ) )
                 goto error;
 
-#ifndef NDEBUG
         case 0:
             break;
 
         default:
-            msg_Err( p_access, "You should not be here" );
-            abort();
-#endif
+            assert(0);
     }
 
     if( p_sys->i_code == 401 )
diff --git a/modules/codec/quicktime.c b/modules/codec/quicktime.c
index 0904d4d003..7c7d77333a 100644
--- a/modules/codec/quicktime.c
+++ b/modules/codec/quicktime.c
@@ -912,7 +912,7 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
         p_sys->i_late = 0;
     }
 #ifndef NDEBUG
-    msg_Dbg( p_dec, "bufsize: %d", (int)p_block->i_buffer);
+    msg_Dbg( p_dec, "bufsize: %zu", p_block->i_buffer);
 #endif
 
     if( p_sys->i_late > 10 )
diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c
index 5fcc74de2e..5467c0e789 100644
--- a/modules/codec/svcdsub.c
+++ b/modules/codec/svcdsub.c
@@ -394,20 +394,18 @@ static void ParseHeader( decoder_t *p_dec, block_t *p_block )
     p_sys->metadata_length = p_sys->i_image_offset;
 
 #ifndef NDEBUG
+    msg_Dbg( p_dec, "x-start: %d, y-start: %d, width: %d, height %d, "
+             "spu size: %zu, duration: %"PRIu64" (d:%zu p:%"PRIu16")",
+             p_sys->i_x_start, p_sys->i_y_start,
+             p_sys->i_width, p_sys->i_height,
+             p_sys->i_spu_size, p_sys->i_duration,
+             p_sys->i_image_length, p_sys->i_image_offset);
+
+    for( i = 0; i < 4; i++ )
     {
-        msg_Dbg( p_dec, "x-start: %d, y-start: %d, width: %d, height %d, "
-                "spu size: %zu, duration: %"PRIu64" (d:%zu p:%"PRIu16")",
-                p_sys->i_x_start, p_sys->i_y_start,
-                p_sys->i_width, p_sys->i_height,
-                p_sys->i_spu_size, p_sys->i_duration,
-                p_sys->i_image_length, p_sys->i_image_offset);
-
-        for( i = 0; i < 4; i++ )
-        {
-            msg_Dbg( p_dec, "palette[%d]= T: %2x, Y: %2x, u: %2x, v: %2x", i,
-                    p_sys->p_palette[i][3], p_sys->p_palette[i][0],
-                    p_sys->p_palette[i][1], p_sys->p_palette[i][2] );
-        }
+        msg_Dbg( p_dec, "palette[%d]= T: %2x, Y: %2x, u: %2x, v: %2x", i,
+                 p_sys->p_palette[i][3], p_sys->p_palette[i][0],
+                 p_sys->p_palette[i][1], p_sys->p_palette[i][2] );
     }
 #endif
 }