From: Gildas Bazin <gbazin@videolan.org>
Date: Sat, 5 Mar 2005 17:54:19 +0000 (+0000)
Subject: * modules/demux/*: removed useless probing messages.
X-Git-Tag: 0.8.2~962
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=91f2877dec9e00d081facbb7b12f610a9f329357;p=vlc

* modules/demux/*: removed useless probing messages.
---

diff --git a/modules/demux/aac.c b/modules/demux/aac.c
index 9180e4db22..b7a24f5ecf 100644
--- a/modules/demux/aac.c
+++ b/modules/demux/aac.c
@@ -123,7 +123,6 @@ static int Open( vlc_object_t * p_this )
         /* I haven't find any sure working aac detection so only forced or
          * extention check
          */
-        msg_Warn( p_demux, "AAC module discarded" );
         return VLC_EGENERIC;
     }
 
diff --git a/modules/demux/aiff.c b/modules/demux/aiff.c
index 5dc2ac3c03..2cafb0566f 100644
--- a/modules/demux/aiff.c
+++ b/modules/demux/aiff.c
@@ -103,14 +103,9 @@ static int Open( vlc_object_t *p_this )
 
     uint8_t     *p_peek;
 
-    if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 )
-    {
-        msg_Err( p_demux, "cannot peek" );
-        return VLC_EGENERIC;
-    }
+    if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 ) return VLC_EGENERIC;
     if( strncmp( &p_peek[0], "FORM", 4 ) || strncmp( &p_peek[8], "AIFF", 4 ) )
     {
-        msg_Warn( p_demux, "AIFF module discarded" );
         return VLC_EGENERIC;
     }
 
diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index 9140227756..e7ae145244 100644
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@ -108,18 +108,11 @@ static int Open( vlc_object_t * p_this )
     guid_t      guid;
     uint8_t     *p_peek;
 
-    /* a little test to see if it could be a asf stream */
-    if( stream_Peek( p_demux->s, &p_peek, 16 ) < 16 )
-    {
-        msg_Warn( p_demux, "ASF plugin discarded (cannot peek)" );
-        return VLC_EGENERIC;
-    }
+    /* A little test to see if it could be a asf stream */
+    if( stream_Peek( p_demux->s, &p_peek, 16 ) < 16 ) return VLC_EGENERIC;
+
     ASF_GetGUID( &guid, p_peek );
-    if( !ASF_CmpGUID( &guid, &asf_object_header_guid ) )
-    {
-        msg_Warn( p_demux, "ASF plugin discarded (not a valid file)" );
-        return VLC_EGENERIC;
-    }
+    if( !ASF_CmpGUID( &guid, &asf_object_header_guid ) ) return VLC_EGENERIC;
 
     /* Set p_demux fields */
     p_demux->pf_demux = Demux;
diff --git a/modules/demux/au.c b/modules/demux/au.c
index e3543b8caf..514da8ccc4 100644
--- a/modules/demux/au.c
+++ b/modules/demux/au.c
@@ -105,14 +105,10 @@ static int Open( vlc_object_t *p_this )
     int          i_cat;
     int          i_samples, i_modulo;
 
-    if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
-    {
-        msg_Warn( p_demux, "cannot peek" );
-        return VLC_EGENERIC;
-    }
+    if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
+
     if( strncmp( p_peek, ".snd", 4 ) )
     {
-        msg_Warn( p_demux, "AU module discarded" );
         return VLC_EGENERIC;
     }
 
diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 2bec734136..17433a0c60 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -206,24 +206,17 @@ static int Open( vlc_object_t * p_this )
 
     uint8_t  *p_peek;
 
-
     /* Is it an avi file ? */
-    if( stream_Peek( p_demux->s, &p_peek, 200 ) < 200 )
-    {
-        msg_Dbg( p_demux, "cannot peek()" );
-        return VLC_EGENERIC;
-    }
+    if( stream_Peek( p_demux->s, &p_peek, 200 ) < 200 ) return VLC_EGENERIC;
+
     for( i_peeker = 0; i_peeker < 188; i_peeker++ )
     {
-        if( !strncmp( &p_peek[0], "RIFF", 4 ) && !strncmp( &p_peek[8], "AVI ", 4 ) )
-        {
-            break;
-        }
+        if( !strncmp( &p_peek[0], "RIFF", 4 ) &&
+            !strncmp( &p_peek[8], "AVI ", 4 ) ) break;
         p_peek++;
     }
     if( i_peeker == 188 )
     {
-        msg_Warn( p_demux, "avi module discarded (invalid header)" );
         return VLC_EGENERIC;
     }
 
diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index 401089b604..71aecf9029 100644
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -73,18 +73,12 @@ static int Open( vlc_object_t * p_this )
     es_format_t  fmt;
 
     /* Have a peep at the show. */
-    if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
-    {
-        /* Stream shorter than 4 bytes... */
-        msg_Err( p_demux, "cannot peek()" );
-        return VLC_EGENERIC;
-    }
+    if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
 
     if( p_peek[0]!='f' || p_peek[1]!='L' || p_peek[2]!='a' || p_peek[3]!='C' )
     {
         if( strncmp( p_demux->psz_demux, "flac", 4 ) )
         {
-            msg_Warn( p_demux, "flac module discarded (no startcode)" );
             return VLC_EGENERIC;
         }
         /* User forced */
diff --git a/modules/demux/livedotcom.cpp b/modules/demux/livedotcom.cpp
index 127eb4ddd7..8db98859e1 100644
--- a/modules/demux/livedotcom.cpp
+++ b/modules/demux/livedotcom.cpp
@@ -193,16 +193,12 @@ static int  Open ( vlc_object_t *p_this )
     {
         /* See if it looks like a SDP
            v, o, s fields are mandatory and in this order */
-        if( stream_Peek( p_demux->s, &p_peek, 7 ) < 7 )
-        {
-            msg_Err( p_demux, "cannot peek" );
-            return VLC_EGENERIC;
-        }
+        if( stream_Peek( p_demux->s, &p_peek, 7 ) < 7 ) return VLC_EGENERIC;
+
         if( strncmp( (char*)p_peek, "v=0\r\n", 5 ) &&
             strncmp( (char*)p_peek, "v=0\n", 4 ) &&
             ( p_peek[0] < 'a' || p_peek[0] > 'z' || p_peek[1] != '=' ) )
         {
-            msg_Warn( p_demux, "SDP module discarded" );
             return VLC_EGENERIC;
         }
     }
diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 438a0f0853..0665a32592 100644
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -483,21 +483,11 @@ static int Open( vlc_object_t * p_this )
     EbmlElement *el = NULL, *el1 = NULL;
 
     /* peek the begining */
-    if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
-    {
-        msg_Warn( p_demux, "cannot peek" );
-        return VLC_EGENERIC;
-    }
+    if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
 
     /* is a valid file */
     if( p_peek[0] != 0x1a || p_peek[1] != 0x45 ||
-        p_peek[2] != 0xdf || p_peek[3] != 0xa3 )
-    {
-        msg_Warn( p_demux, "matroska module discarded "
-                           "(invalid header 0x%.2x%.2x%.2x%.2x)",
-                           p_peek[0], p_peek[1], p_peek[2], p_peek[3] );
-        return VLC_EGENERIC;
-    }
+        p_peek[2] != 0xdf || p_peek[3] != 0xa3 ) return VLC_EGENERIC;
 
     /* Set the demux function */
     p_demux->pf_demux   = Demux;
diff --git a/modules/demux/mod.c b/modules/demux/mod.c
index 6b081e51d5..266d1ce46f 100644
--- a/modules/demux/mod.c
+++ b/modules/demux/mod.c
@@ -110,11 +110,9 @@ static int Open( vlc_object_t *p_this )
     /* We accept file based on extention match */
     if( strcasecmp( p_demux->psz_demux, "mod" ) )
     {
-        if( ( ext = strchr( p_demux->psz_path, '.' ) ) == NULL || stream_Size( p_demux->s ) == 0 )
-        {
-            msg_Warn( p_demux, "MOD module discarded (path=%s)", p_demux->psz_path );
-            return VLC_EGENERIC;
-        }
+        if( ( ext = strchr( p_demux->psz_path, '.' ) ) == NULL ||
+            stream_Size( p_demux->s ) == 0 ) return VLC_EGENERIC;
+
         ext++;  /* skip . */
         for( i = 0; mod_ext[i] != NULL; i++ )
         {
@@ -123,11 +121,7 @@ static int Open( vlc_object_t *p_this )
                 break;
             }
         }
-        if( mod_ext[i] == NULL )
-        {
-            msg_Warn( p_demux, "MOD module discarded (extention '%s' unknown)", ext );
-            return VLC_EGENERIC;
-        }
+        if( mod_ext[i] == NULL ) return VLC_EGENERIC;
         msg_Dbg( p_demux, "running MOD demuxer (ext=%s)", mod_ext[i] );
     }
 
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index ba8dd28dd4..d3ef974242 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -259,12 +259,9 @@ static int Open( vlc_object_t * p_this )
     unsigned int    i;
     vlc_bool_t      b_seekable;
 
-    /* a little test to see if it could be a mp4 */
-    if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 )
-    {
-        msg_Warn( p_demux, "MP4 plugin discarded (cannot peek)" );
-        return VLC_EGENERIC;
-    }
+    /* A little test to see if it could be a mp4 */
+    if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 ) return VLC_EGENERIC;
+
     switch( VLC_FOURCC( p_peek[4], p_peek[5], p_peek[6], p_peek[7] ) )
     {
         case FOURCC_ftyp:
@@ -279,7 +276,6 @@ static int Open( vlc_object_t * p_this )
         case VLC_FOURCC( 'p', 'n', 'o', 't' ):
             break;
          default:
-            msg_Warn( p_demux, "MP4 plugin discarded (not a valid file)" );
             return VLC_EGENERIC;
     }
 
diff --git a/modules/demux/mpeg/mpga.c b/modules/demux/mpeg/mpga.c
index d0448e7751..d03880a0bb 100644
--- a/modules/demux/mpeg/mpga.c
+++ b/modules/demux/mpeg/mpga.c
@@ -142,7 +142,6 @@ static int Open( vlc_object_t * p_this )
 
     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
     {
-        msg_Err( p_demux, "cannot peek" );
         if( p_meta ) vlc_meta_Delete( p_meta );
         return VLC_EGENERIC;
     }
@@ -171,7 +170,6 @@ static int Open( vlc_object_t * p_this )
         }
         if( !b_ok && !p_demux->b_force )
         {
-            msg_Warn( p_demux, "mpga module discarded" );
             if( p_meta ) vlc_meta_Delete( p_meta );
             return VLC_EGENERIC;
         }
diff --git a/modules/demux/mpeg/mpgv.c b/modules/demux/mpeg/mpgv.c
index 7753265dd2..d4a41e8ddc 100644
--- a/modules/demux/mpeg/mpgv.c
+++ b/modules/demux/mpeg/mpgv.c
@@ -88,22 +88,14 @@ static int Open( vlc_object_t * p_this )
 
     if( p_peek[0] != 0x00 || p_peek[1] != 0x00 || p_peek[2] != 0x01 )
     {
-        if( !b_forced )
-        {
-            msg_Warn( p_demux, "ES module discarded (no startcode)" );
-            return VLC_EGENERIC;
-        }
+        if( !b_forced ) return VLC_EGENERIC;
 
         msg_Err( p_demux, "this doesn't look like an MPEG ES stream, continuing" );
     }
 
     if( p_peek[3] > 0xb9 )
     {
-        if( !b_forced )
-        {
-            msg_Warn( p_demux, "ES module discarded (system startcode)" );
-            return VLC_EGENERIC;
-        }
+        if( !b_forced ) return VLC_EGENERIC;
         msg_Err( p_demux, "this seems to be a system stream (PS plug-in ?), but continuing" );
     }
 
diff --git a/modules/demux/nsv.c b/modules/demux/nsv.c
index 1201b82a14..0c90a58e10 100644
--- a/modules/demux/nsv.c
+++ b/modules/demux/nsv.c
@@ -88,17 +88,13 @@ static int Open( vlc_object_t *p_this )
 
     uint8_t     *p_peek;
 
-    if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 )
-    {
-        msg_Err( p_demux, "cannot peek" );
-        return VLC_EGENERIC;
-    }
+    if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 ) return VLC_EGENERIC;
+
     if( strncmp( p_peek, "NSVf", 4 ) && strncmp( p_peek, "NSVs", 4 ))
     {
        /* In case we had force this demuxer we try to resynch */
         if( strcmp( p_demux->psz_demux, "nsv" ) || ReSynch( p_demux ) )
         {
-            msg_Warn( p_demux, "NSV module discarded" );
             return VLC_EGENERIC;
         }
     }
diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 13ca83fdfd..f4043000b7 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -182,14 +182,9 @@ static int Open( vlc_object_t * p_this )
 
 
     /* Check if we are dealing with an ogg stream */
-    if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
-    {
-        msg_Err( p_demux, "cannot peek" );
-        return VLC_EGENERIC;
-    }
+    if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
     if( strcmp( p_demux->psz_demux, "ogg" ) && strncmp( p_peek, "OggS", 4 ) )
     {
-        msg_Warn( p_demux, "ogg module discarded (invalid header)" );
         return VLC_EGENERIC;
     }
 
diff --git a/modules/demux/playlist/old.c b/modules/demux/playlist/old.c
index 0e776c55d5..644fecf59c 100644
--- a/modules/demux/playlist/old.c
+++ b/modules/demux/playlist/old.c
@@ -49,17 +49,10 @@ int Import_Old( vlc_object_t *p_this )
     demux_t *p_demux = (demux_t *)p_this;
     uint8_t *p_peek;
 
-    if( stream_Peek( p_demux->s, &p_peek, 31 ) < 31 )
-    {
-        msg_Err( p_demux, "cannot peek" );
-        return VLC_EGENERIC;
-    }
+    if( stream_Peek( p_demux->s, &p_peek, 31 ) < 31 ) return VLC_EGENERIC;
+
+    if( strncmp( p_peek, PLAYLIST_FILE_HEADER , 31 ) ) return VLC_EGENERIC;
 
-    if( strncmp( p_peek, PLAYLIST_FILE_HEADER , 31 ) )
-    {
-        msg_Warn(p_demux, "old import module discarded: invalid file");
-        return VLC_EGENERIC;
-    }
     msg_Dbg( p_demux, "found valid old playlist file");
 
     p_demux->pf_control = Control;
diff --git a/modules/demux/playlist/pls.c b/modules/demux/playlist/pls.c
index bd33e62054..4b9e56e31e 100644
--- a/modules/demux/playlist/pls.c
+++ b/modules/demux/playlist/pls.c
@@ -55,11 +55,7 @@ int Import_PLS( vlc_object_t *p_this )
     uint8_t *p_peek;
     char    *psz_ext;
 
-    if( stream_Peek( p_demux->s , &p_peek, 7 ) < 7 )
-    {
-        msg_Err( p_demux, "cannot peek" );
-        return VLC_EGENERIC;
-    }
+    if( stream_Peek( p_demux->s , &p_peek, 7 ) < 7 ) return VLC_EGENERIC;
     psz_ext = strrchr ( p_demux->psz_path, '.' );
 
     if( !strncasecmp( p_peek, "[playlist]", 10 ) )
@@ -71,12 +67,8 @@ int Import_PLS( vlc_object_t *p_this )
     {
         ;
     }
-    else
-    {
-        msg_Warn(p_demux, "pls import module discarded");
-        return VLC_EGENERIC;
-        
-    }
+    else return VLC_EGENERIC;
+
     msg_Dbg( p_demux, "found valid PLS playlist file");
 
     p_demux->pf_control = Control;
diff --git a/modules/demux/pva.c b/modules/demux/pva.c
index b699ea3b65..b22df5ee29 100644
--- a/modules/demux/pva.c
+++ b/modules/demux/pva.c
@@ -84,17 +84,12 @@ static int Open( vlc_object_t *p_this )
     es_format_t  fmt;
     uint8_t     *p_peek;
 
-    if( stream_Peek( p_demux->s, &p_peek, 5 ) < 5 )
-    {
-        msg_Err( p_demux, "cannot peek" );
-        return VLC_EGENERIC;
-    }
+    if( stream_Peek( p_demux->s, &p_peek, 5 ) < 5 ) return VLC_EGENERIC;
     if( p_peek[0] != 'A' || p_peek[1] != 'V' || p_peek[4] != 0x55 )
     {
         /* In case we had forced this demuxer we try to resynch */
         if( strcasecmp( p_demux->psz_demux, "pva" ) || ReSynch( p_demux ) )
         {
-            msg_Warn( p_demux, "PVA module discarded" );
             return VLC_EGENERIC;
         }
     }
diff --git a/modules/demux/real.c b/modules/demux/real.c
index 01e0cdfb46..c9eeb32030 100644
--- a/modules/demux/real.c
+++ b/modules/demux/real.c
@@ -92,16 +92,8 @@ static int Open( vlc_object_t *p_this )
 
     uint8_t     *p_peek;
 
-    if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 )
-    {
-        msg_Err( p_demux, "cannot peek" );
-        return VLC_EGENERIC;
-    }
-    if( strncmp( p_peek, ".RMF", 4 ) )
-    {
-        msg_Warn( p_demux, "Real module discarded" );
-        return VLC_EGENERIC;
-    }
+    if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) return VLC_EGENERIC;
+    if( strncmp( p_peek, ".RMF", 4 ) ) return VLC_EGENERIC;
 
     /* Fill p_demux field */
     p_demux->pf_demux = Demux;
diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 5f6fb25057..c7ab9f9858 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -327,11 +327,7 @@ static int Open( vlc_object_t *p_this )
     vlc_value_t  val;
 
     if( stream_Peek( p_demux->s, &p_peek, TS_PACKET_SIZE_MAX ) <
-        TS_PACKET_SIZE_MAX )
-    {
-        msg_Err( p_demux, "cannot peek" );
-        return VLC_EGENERIC;
-    }
+        TS_PACKET_SIZE_MAX ) return VLC_EGENERIC;
 
     /* Search first sync byte */
     for( i_sync = 0; i_sync < TS_PACKET_SIZE_MAX; i_sync++ )
@@ -340,11 +336,7 @@ static int Open( vlc_object_t *p_this )
     }
     if( i_sync >= TS_PACKET_SIZE_MAX )
     {
-        if( strcmp( p_demux->psz_demux, "ts" ) )
-        {
-            msg_Warn( p_demux, "TS module discarded" );
-            return VLC_EGENERIC;
-        }
+        if( strcmp( p_demux->psz_demux, "ts" ) ) return VLC_EGENERIC;
         msg_Warn( p_demux, "this does not look like a TS stream, continuing" );
     }
 
diff --git a/modules/demux/util/id3.c b/modules/demux/util/id3.c
index 241afb20d1..58dfc19321 100644
--- a/modules/demux/util/id3.c
+++ b/modules/demux/util/id3.c
@@ -60,11 +60,7 @@ static int SkipID3Tag( vlc_object_t *p_this )
     msg_Dbg( p_demux, "checking for ID3 tag" );
 
     /* get 10 byte id3 header */
-    if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 )
-    {
-        msg_Err( p_demux, "cannot peek()" );
-        return VLC_EGENERIC;
-    }
+    if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) return VLC_EGENERIC;
 
     if( p_peek[0] != 'I' || p_peek[1] != 'D' || p_peek[2] != '3' )
     {
diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index d2c6f20985..5db087f16e 100644
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -110,11 +110,8 @@ static int Open( vlc_object_t * p_this )
     WAVEFORMATEX         *p_wf;
 
     /* Is it a wav file ? */
-    if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 )
-    {
-        msg_Warn( p_demux, "WAV module discarded (cannot peek)" );
-        return VLC_EGENERIC;
-    }
+    if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 ) return VLC_EGENERIC;
+
     if( strncmp( p_peek, "RIFF", 4 ) || strncmp( &p_peek[8], "WAVE", 4 ) )
     {
         return VLC_EGENERIC;
diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index 7bf7813e39..56af26b913 100644
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -368,24 +368,17 @@ static int OpenDemux( vlc_object_t *p_this )
     char *psz_sdp = (char *)malloc( i_max_sdp );
     sdp_t *p_sdp = NULL;
 
-    if( !psz_sdp )
-    {
-        return VLC_EGENERIC;
-    }
+    if( !psz_sdp ) return VLC_EGENERIC;
 
     /* Probe for SDP */
     if( p_demux->s )
     {
-        if( stream_Peek( p_demux->s, &p_peek, 7 ) < 7 )
-        {
-            msg_Err( p_demux, "cannot peek" );
-            return VLC_EGENERIC;
-        }
+        if( stream_Peek( p_demux->s, &p_peek, 7 ) < 7 ) return VLC_EGENERIC;
+
         if( strncmp( (char*)p_peek, "v=0\r\n", 5 ) &&
             strncmp( (char*)p_peek, "v=0\n", 4 ) &&
             ( p_peek[0] < 'a' || p_peek[0] > 'z' || p_peek[1] != '=' ) )
         {
-            msg_Warn( p_demux, "SDP (UDP) module discarded" );
             return VLC_EGENERIC;
         }
     }