[vlc-commits] demux: playlist: pass explicit parameter to CHECK_FILE
Rémi Denis-Courmont
git at videolan.org
Sat Jun 3 20:47:34 CEST 2017
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon May 22 19:41:46 2017 +0300| [e1eb514fe214307f641b5932e525b3777a867835] | committer: Rémi Denis-Courmont
demux: playlist: pass explicit parameter to CHECK_FILE
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e1eb514fe214307f641b5932e525b3777a867835
---
modules/demux/playlist/asx.c | 2 +-
modules/demux/playlist/b4s.c | 2 +-
modules/demux/playlist/dvb.c | 2 +-
modules/demux/playlist/ifo.c | 2 +-
modules/demux/playlist/itml.c | 2 +-
modules/demux/playlist/m3u.c | 2 +-
modules/demux/playlist/playlist.h | 4 ++--
modules/demux/playlist/pls.c | 3 ++-
modules/demux/playlist/podcast.c | 2 +-
modules/demux/playlist/qtl.c | 2 +-
modules/demux/playlist/ram.c | 2 +-
modules/demux/playlist/sgimb.c | 2 +-
modules/demux/playlist/shoutcast.c | 2 +-
modules/demux/playlist/wpl.c | 2 +-
modules/demux/playlist/xspf.c | 2 +-
15 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c
index 67eab58699..856e3f5e38 100644
--- a/modules/demux/playlist/asx.c
+++ b/modules/demux/playlist/asx.c
@@ -147,7 +147,7 @@ int Import_ASX( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
- CHECK_FILE();
+ CHECK_FILE(p_demux);
char *type = stream_MimeType( p_demux->s );
diff --git a/modules/demux/playlist/b4s.c b/modules/demux/playlist/b4s.c
index a9ebba02e8..af1451f9e7 100644
--- a/modules/demux/playlist/b4s.c
+++ b/modules/demux/playlist/b4s.c
@@ -49,7 +49,7 @@ int Import_B4S( vlc_object_t *p_this )
{
demux_t *demux = (demux_t *)p_this;
- CHECK_FILE();
+ CHECK_FILE(demux);
if( !demux_IsPathExtension( demux, ".b4s" )
&& !demux_IsForced( demux, "b4s-open" ) )
return VLC_EGENERIC;
diff --git a/modules/demux/playlist/dvb.c b/modules/demux/playlist/dvb.c
index 9de9cddcad..7a11a724b3 100644
--- a/modules/demux/playlist/dvb.c
+++ b/modules/demux/playlist/dvb.c
@@ -46,7 +46,7 @@ int Import_DVB(vlc_object_t *p_this)
{
demux_t *demux = (demux_t *)p_this;
- CHECK_FILE();
+ CHECK_FILE(demux);
if (!demux_IsPathExtension(demux, ".conf" ) && !demux->obj.force )
return VLC_EGENERIC;
diff --git a/modules/demux/playlist/ifo.c b/modules/demux/playlist/ifo.c
index 9b28c7cd55..201d94e5c1 100644
--- a/modules/demux/playlist/ifo.c
+++ b/modules/demux/playlist/ifo.c
@@ -47,7 +47,7 @@ int Import_IFO( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
- CHECK_FILE();
+ CHECK_FILE(p_demux);
if( !p_demux->psz_file )
return VLC_EGENERIC;
diff --git a/modules/demux/playlist/itml.c b/modules/demux/playlist/itml.c
index 0ba2cba2aa..9eb60bdc5e 100644
--- a/modules/demux/playlist/itml.c
+++ b/modules/demux/playlist/itml.c
@@ -47,7 +47,7 @@ static int Demux( demux_t * );
int Import_iTML( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
- CHECK_FILE();
+ CHECK_FILE(p_demux);
if( !demux_IsPathExtension( p_demux, ".xml" )
&& !demux_IsForced( p_demux, "itml" ) )
return VLC_EGENERIC; \
diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c
index c9183a799f..6d3619bba0 100644
--- a/modules/demux/playlist/m3u.c
+++ b/modules/demux/playlist/m3u.c
@@ -69,7 +69,7 @@ int Import_M3U( vlc_object_t *p_this )
char *(*pf_dup) (const char *) = GuessEncoding;
int offset = 0;
- CHECK_FILE();
+ CHECK_FILE(p_demux);
if( vlc_stream_Peek( p_demux->s, &p_peek, 3 ) == 3
&& !memcmp( p_peek, "\xef\xbb\xbf", 3) )
{
diff --git a/modules/demux/playlist/playlist.h b/modules/demux/playlist/playlist.h
index 0e3d3a0014..283ccdee44 100644
--- a/modules/demux/playlist/playlist.h
+++ b/modules/demux/playlist/playlist.h
@@ -72,9 +72,9 @@ static inline input_item_t * GetCurrentItem(demux_t *p_demux)
return input_GetItem( p_demux->p_input );
}
-#define CHECK_FILE() \
+#define CHECK_FILE(obj) \
do { \
- if( vlc_stream_Control( ((demux_t *)p_this)->s, \
+ if( vlc_stream_Control( (obj)->s, \
STREAM_IS_DIRECTORY ) == VLC_SUCCESS ) \
return VLC_EGENERIC; \
} while(0)
diff --git a/modules/demux/playlist/pls.c b/modules/demux/playlist/pls.c
index f2267db0f9..8dc2f793b5 100644
--- a/modules/demux/playlist/pls.c
+++ b/modules/demux/playlist/pls.c
@@ -46,7 +46,8 @@ int Import_PLS( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
const uint8_t *p_peek;
- CHECK_FILE();
+
+ CHECK_FILE(p_demux);
if( vlc_stream_Peek( p_demux->s , &p_peek, 10 ) < 10 ) {
msg_Dbg( p_demux, "not enough data" );
diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c
index 9f6553cce2..d1e588a143 100644
--- a/modules/demux/playlist/podcast.c
+++ b/modules/demux/playlist/podcast.c
@@ -48,7 +48,7 @@ int Import_podcast( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
- CHECK_FILE();
+ CHECK_FILE(p_demux);
if( !demux_IsForced( p_demux, "podcast" ) )
return VLC_EGENERIC;
diff --git a/modules/demux/playlist/qtl.c b/modules/demux/playlist/qtl.c
index 71e20df800..727b6dedcb 100644
--- a/modules/demux/playlist/qtl.c
+++ b/modules/demux/playlist/qtl.c
@@ -84,7 +84,7 @@ int Import_QTL( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
- CHECK_FILE();
+ CHECK_FILE(p_demux);
if( !demux_IsPathExtension( p_demux, ".qtl" ) )
return VLC_EGENERIC;
diff --git a/modules/demux/playlist/ram.c b/modules/demux/playlist/ram.c
index 0415784c93..2346ed50fb 100644
--- a/modules/demux/playlist/ram.c
+++ b/modules/demux/playlist/ram.c
@@ -74,7 +74,7 @@ int Import_RAM( vlc_object_t *p_this )
demux_t *p_demux = (demux_t *)p_this;
const uint8_t *p_peek;
- CHECK_FILE();
+ CHECK_FILE(p_demux);
if( !demux_IsPathExtension( p_demux, ".ram" )
&& !demux_IsPathExtension( p_demux, ".rm" ) )
return VLC_EGENERIC;
diff --git a/modules/demux/playlist/sgimb.c b/modules/demux/playlist/sgimb.c
index 24a8a7abed..9e0b5ba69d 100644
--- a/modules/demux/playlist/sgimb.c
+++ b/modules/demux/playlist/sgimb.c
@@ -140,7 +140,7 @@ int Import_SGIMB( vlc_object_t * p_this )
const uint8_t *p_peek;
int i_size;
- CHECK_FILE();
+ CHECK_FILE(p_demux);
/* Lets check the content to see if this is a sgi mediabase file */
i_size = vlc_stream_Peek( p_demux->s, &p_peek, MAX_LINE );
i_size -= sizeof("sgiNameServerHost=") - 1;
diff --git a/modules/demux/playlist/shoutcast.c b/modules/demux/playlist/shoutcast.c
index c32589737a..d4c7cee68c 100644
--- a/modules/demux/playlist/shoutcast.c
+++ b/modules/demux/playlist/shoutcast.c
@@ -59,7 +59,7 @@ int Import_Shoutcast( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
- CHECK_FILE();
+ CHECK_FILE(p_demux);
if( !demux_IsForced( p_demux, "shout-winamp" ) )
return VLC_EGENERIC;
diff --git a/modules/demux/playlist/wpl.c b/modules/demux/playlist/wpl.c
index 9e2296c05c..12c5cf8e8a 100644
--- a/modules/demux/playlist/wpl.c
+++ b/modules/demux/playlist/wpl.c
@@ -298,7 +298,7 @@ int Import_WPL( vlc_object_t* p_this )
{
demux_t* p_demux = (demux_t*)p_this;
- CHECK_FILE();
+ CHECK_FILE(p_demux);
if( !demux_IsPathExtension( p_demux, ".wpl" ) &&
!demux_IsPathExtension( p_demux, ".zpl" ) )
return VLC_EGENERIC;
diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index df3b06fcaf..f89f070c67 100644
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -85,7 +85,7 @@ int Import_xspf(vlc_object_t *p_this)
{
demux_t *p_demux = (demux_t *)p_this;
- CHECK_FILE();
+ CHECK_FILE(p_demux);
if( !demux_IsPathExtension( p_demux, ".xspf" )
&& !demux_IsContentType( p_demux, "application/xspf+xml" ) )
More information about the vlc-commits
mailing list