From 89136d0144cfeaa1c73d37e711834d1ed37561f9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Mon, 6 Nov 2006 17:58:08 +0000 Subject: [PATCH] Add a few harmless const --- include/vlc_demux.h | 2 +- include/vlc_stream.h | 2 +- include/vlc_symbols.h | 4 ++-- src/input/demux.c | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/vlc_demux.h b/include/vlc_demux.h index 4318e30041..1d8c77dbfb 100644 --- a/include/vlc_demux.h +++ b/include/vlc_demux.h @@ -110,7 +110,7 @@ enum demux_query_e /* stream_t *s could be null and then it mean a access+demux in one */ #define demux2_New( a, b, c, d, e, f,g ) __demux2_New(VLC_OBJECT(a),b,c,d,e,f,g) -VLC_EXPORT( demux_t *, __demux2_New, ( vlc_object_t *p_obj, char *psz_access, char *psz_demux, char *psz_path, stream_t *s, es_out_t *out, vlc_bool_t ) ); +VLC_EXPORT( demux_t *, __demux2_New, ( vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, vlc_bool_t ) ); VLC_EXPORT( void, demux2_Delete, ( demux_t * ) ); VLC_EXPORT( int, demux2_vaControlHelper, ( stream_t *, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args ) ); diff --git a/include/vlc_stream.h b/include/vlc_stream.h index 3b4ff21827..0820f5575d 100644 --- a/include/vlc_stream.h +++ b/include/vlc_stream.h @@ -203,7 +203,7 @@ VLC_EXPORT( char *, stream_ReadLine, ( stream_t * ) ); * Create a special stream and a demuxer, this allows chaining demuxers */ #define stream_DemuxNew( a, b, c ) __stream_DemuxNew( VLC_OBJECT(a), b, c) -VLC_EXPORT( stream_t *,__stream_DemuxNew, ( vlc_object_t *p_obj, char *psz_demux, es_out_t *out ) ); +VLC_EXPORT( stream_t *,__stream_DemuxNew, ( vlc_object_t *p_obj, const char *psz_demux, es_out_t *out ) ); VLC_EXPORT( void, stream_DemuxSend, ( stream_t *s, block_t *p_block ) ); VLC_EXPORT( void, stream_DemuxDelete,( stream_t *s ) ); diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h index 87175350ba..1d6a43570a 100644 --- a/include/vlc_symbols.h +++ b/include/vlc_symbols.h @@ -191,7 +191,7 @@ struct module_symbols_t size_t (*vlc_iconv_inner) (vlc_iconv_t, const char **, size_t *, char **, size_t *); int (*vlc_iconv_close_inner) (vlc_iconv_t); char * (*vlc_dgettext_inner) (const char *package, const char *msgid); - demux_t * (*__demux2_New_inner) (vlc_object_t *p_obj, char *psz_access, char *psz_demux, char *psz_path, stream_t *s, es_out_t *out, vlc_bool_t); + demux_t * (*__demux2_New_inner) (vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, vlc_bool_t); void (*demux2_Delete_inner) (demux_t *); int (*demux2_vaControlHelper_inner) (stream_t *, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args); char const * (*vlc_error_inner) (int); @@ -326,7 +326,7 @@ struct module_symbols_t subpicture_t * (*spu_SortSubpictures_inner) (spu_t *, mtime_t, vlc_bool_t); void (*spu_RenderSubpictures_inner) (spu_t *, video_format_t *, picture_t *, picture_t *, subpicture_t *, int, int); char * (*stream_ReadLine_inner) (stream_t *); - stream_t * (*__stream_DemuxNew_inner) (vlc_object_t *p_obj, char *psz_demux, es_out_t *out); + stream_t * (*__stream_DemuxNew_inner) (vlc_object_t *p_obj, const char *psz_demux, es_out_t *out); void (*stream_DemuxSend_inner) (stream_t *s, block_t *p_block); void (*stream_DemuxDelete_inner) (stream_t *s); stream_t * (*__stream_MemoryNew_inner) (vlc_object_t *p_obj, uint8_t *p_buffer, int64_t i_size, vlc_bool_t i_preserve_memory); diff --git a/src/input/demux.c b/src/input/demux.c index 6149dd2aab..a91327cf8b 100644 --- a/src/input/demux.c +++ b/src/input/demux.c @@ -34,7 +34,8 @@ static void SkipID3Tag( demux_t * ); * if s is NULL then load a access_demux *****************************************************************************/ demux_t *__demux2_New( vlc_object_t *p_obj, - char *psz_access, char *psz_demux, char *psz_path, + const char *psz_access, const char *psz_demux, + const char *psz_path, stream_t *s, es_out_t *out, vlc_bool_t b_quick ) { demux_t *p_demux = vlc_object_create( p_obj, VLC_OBJECT_DEMUX ); @@ -301,7 +302,7 @@ static int DStreamControl( stream_t *, int i_query, va_list ); static int DStreamThread ( stream_t * ); -stream_t *__stream_DemuxNew( vlc_object_t *p_obj, char *psz_demux, +stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux, es_out_t *out ) { /* We create a stream reader, and launch a thread */ -- 2.39.2