Some more const

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 636dda185ac685b37c8a1a83d70ea1a4614e3675..f7e78ec9163f3d79bad665e715d37c26595ff3d5 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -188,8 +188,8 @@ VLC_EXPORT(int, input_ItemAddInfo, ( input_item_t *p_i, const char *psz_cat, con
 
 #define input_ItemNew( a,b,c ) input_ItemNewExt( a, b, c, 0, NULL, -1 )
 #define input_ItemNewExt(a,b,c,d,e,f) __input_ItemNewExt( VLC_OBJECT(a),b,c,d,e,f)
-VLC_EXPORT( input_item_t *, __input_ItemNewExt, (vlc_object_t *, const char *, const char*, int, const char **, int)  );
-VLC_EXPORT( input_item_t *, input_ItemNewWithType, ( vlc_object_t *, const char *, const char *e, int, const char **, int, int ) );
+VLC_EXPORT( input_item_t *, __input_ItemNewExt, (vlc_object_t *, const char *, const char*, int, const char *const *, int)  );
+VLC_EXPORT( input_item_t *, input_ItemNewWithType, ( vlc_object_t *, const char *, const char *e, int, const char *const *, int, int ) );
 
 VLC_EXPORT( input_item_t *, input_ItemGetById, (playlist_t *, int ) );
 

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 5fea4f90cd877bc5911d342a3259ca9eaed06074..afb8d8c1437ae5b33aecd68d5a8b2637094c8a58 100644 (file)
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -259,7 +259,7 @@ VLC_EXPORT( int,  playlist_Export, ( playlist_t *, const char *, playlist_item_t
 
 /*************************** Item creation **************************/
 
-VLC_EXPORT( playlist_item_t* , playlist_ItemNewWithType, ( vlc_object_t *,const char *,const char *, int , const char **, int, int) );
+VLC_EXPORT( playlist_item_t* , playlist_ItemNewWithType, ( vlc_object_t *,const char *,const char *, int , const char *const *, int, int) );
 
 #define playlist_ItemNew( a , b, c ) __playlist_ItemNew(VLC_OBJECT(a) , b , c )
 /** Create a new item, without adding it to the playlist
@@ -287,11 +287,11 @@ VLC_EXPORT( int,  playlist_LockDelete, ( playlist_t *, int ) );
 VLC_EXPORT( int,  playlist_LockDeleteAllFromInput, ( playlist_t *, int ) );
 
 /*************************** Item fields accessors **************************/
-VLC_EXPORT( int, playlist_ItemSetName, (playlist_item_t *,  char * ) );
+VLC_EXPORT( int, playlist_ItemSetName, (playlist_item_t *, const char * ) );
 
 /******************** Item addition ********************/
 VLC_EXPORT( int,  playlist_Add,    ( playlist_t *, const char *, const char *, int, int, vlc_bool_t ) );
-VLC_EXPORT( int,  playlist_AddExt, ( playlist_t *, const char *, const char *, int, int, mtime_t, const char **,int, vlc_bool_t ) );
+VLC_EXPORT( int,  playlist_AddExt, ( playlist_t *, const char *, const char *, int, int, mtime_t, const char *const *,int, vlc_bool_t ) );
 VLC_EXPORT( int, playlist_AddInput, ( playlist_t *, input_item_t *,int , int, vlc_bool_t ) );
 VLC_EXPORT( playlist_item_t *, playlist_NodeAddInput, ( playlist_t *, input_item_t *,playlist_item_t *,int , int ) );
 VLC_EXPORT( void, playlist_NodeAddItem, ( playlist_t *, playlist_item_t *, playlist_item_t *,int , int ) );

diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h
index 74036f05ff7343c48b0992ca65238b33c46f78a5..d69cd37691b99712e4b72f6e185d7ccc2432eb62 100644 (file)
--- a/include/vlc_symbols.h
+++ b/include/vlc_symbols.h
@@ -267,11 +267,11 @@ struct module_symbols_t
     vlc_bool_t (*playlist_IsServicesDiscoveryLoaded_inner) (playlist_t *,const char *);
     void *__playlist_ItemNew_deprecated;
     void *__playlist_ItemCopy_deprecated;
-    playlist_item_t* (*playlist_ItemNewWithType_inner) (vlc_object_t *,const char *,const char *, int , const char **, int, int);
+    playlist_item_t* (*playlist_ItemNewWithType_inner) (vlc_object_t *,const char *,const char *, int , const char *const *, int, int);
     int (*playlist_ItemDelete_inner) (playlist_item_t *);
     void *playlist_ItemAddParent_deprecated;
     void *playlist_CopyParents_deprecated;
-    int (*playlist_ItemSetName_inner) (playlist_item_t *,  char *);
+    int (*playlist_ItemSetName_inner) (playlist_item_t *, const char *);
     void *playlist_ItemSetDuration_deprecated;
     void *playlist_ViewInsert_deprecated;
     void *playlist_ViewDelete_deprecated;
@@ -288,7 +288,7 @@ struct module_symbols_t
     int (*playlist_NodeDelete_inner) (playlist_t *, playlist_item_t *, vlc_bool_t , vlc_bool_t);
     int (*playlist_NodeEmpty_inner) (playlist_t *, playlist_item_t *, vlc_bool_t);
     int (*playlist_Add_inner) (playlist_t *, const char *, const char *, int, int, vlc_bool_t);
-    int (*playlist_AddExt_inner) (playlist_t *, const char *, const char *, int, int, mtime_t, const char **,int, vlc_bool_t);
+    int (*playlist_AddExt_inner) (playlist_t *, const char *, const char *, int, int, mtime_t, const char *const *,int, vlc_bool_t);
     void *playlist_ItemAdd_deprecated;
     void (*playlist_NodeAddItem_inner) (playlist_t *, playlist_item_t *, playlist_item_t *,int , int);
     void *playlist_Delete_deprecated;
@@ -492,8 +492,8 @@ struct module_symbols_t
     char * (*encode_URI_component_inner) (const char *psz);
     size_t (*vlc_strlcpy_inner) (char *, const char *, size_t);
     void *playlist_ItemNewFromInput_deprecated;
-    input_item_t * (*__input_ItemNewExt_inner) (vlc_object_t *, const char *, const char*, int, const char **, int);
-    input_item_t * (*input_ItemNewWithType_inner) (vlc_object_t *, const char *, const char *e, int, const char **, int, int);
+    input_item_t * (*__input_ItemNewExt_inner) (vlc_object_t *, const char *, const char*, int, const char *const *, int);
+    input_item_t * (*input_ItemNewWithType_inner) (vlc_object_t *, const char *, const char *e, int, const char *const *, int, int);
     playlist_item_t * (*playlist_NodeAddInput_inner) (playlist_t *, input_item_t *,playlist_item_t *,int , int);
     void *playlist_PlaylistAdd_deprecated;
     void *playlist_PlaylistAddExt_deprecated;

diff --git a/src/input/input.c b/src/input/input.c
index 74d1cf814647aa8b3a1443287306561f8d113caf..790bd6366ef827315b4031830f9bdd9b09f6bc7e 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -74,7 +74,7 @@ static void MRLSections( input_thread_t *, char *, int *, int *, int *, int *);
 
 static input_source_t *InputSourceNew( input_thread_t *);
 static int  InputSourceInit( input_thread_t *, input_source_t *,
-                             char *, char *psz_forced_demux );
+                             char *, const char *psz_forced_demux );
 static void InputSourceClean( input_thread_t *, input_source_t * );
 
 static void SlaveDemux( input_thread_t *p_input );
@@ -1922,7 +1922,7 @@ static input_source_t *InputSourceNew( input_thread_t *p_input )
  *****************************************************************************/
 static int InputSourceInit( input_thread_t *p_input,
                             input_source_t *in, char *psz_mrl,
-                            char *psz_forced_demux )
+                            const char *psz_forced_demux )
 {
     char *psz_dup = strdup( psz_mrl );
     char *psz_access;
@@ -2325,7 +2325,8 @@ static void InputMetaUser( input_thread_t *p_input )
  *           Media Resource Locator.
  *****************************************************************************/
 void MRLSplit( vlc_object_t *p_input, char *psz_dup,
-               char **ppsz_access, char **ppsz_demux, char **ppsz_path )
+               const char **ppsz_access, const char **ppsz_demux,
+               const char **ppsz_path )
 {
     char *psz_access = NULL;
     char *psz_demux  = NULL;

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 8b16f1a1e090071b0fc03f40af448d5a5467ff87..b88d5f39e3c3fdb8ee4376c7b43e504d0ba3f936 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -154,7 +154,7 @@ mtime_t input_ClockGetTS( input_thread_t *, input_clock_t *, mtime_t );
 char **subtitles_Detect( input_thread_t *, char* path, char *fname );
 int subtitles_Filter( const char *);
 
-void MRLSplit( vlc_object_t *, char *, char **, char **, char ** );
+void MRLSplit( vlc_object_t *, char *, const char **, const char **, const char ** );
 
 static inline void input_ChangeState( input_thread_t *p_input, int state )
 {

diff --git a/src/input/item.c b/src/input/item.c
index a9937b79d36973794a9f0dca6aaf375f61cd5467..06685af7f500e5d2fb64062c3a3d275e0816a22d 100644 (file)
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -190,7 +190,7 @@ input_item_t *input_ItemGetById( playlist_t *p_playlist, int i_id )
 
 input_item_t *__input_ItemNewExt( vlc_object_t *p_obj, const char *psz_uri,
                                   const char *psz_name, int i_options,
-                                  const char **ppsz_options, int i_duration )
+                                  const char *const *ppsz_options, int i_duration )
 {
     return input_ItemNewWithType( p_obj, psz_uri, psz_name,
                                   i_options, ppsz_options,
@@ -200,7 +200,7 @@ input_item_t *__input_ItemNewExt( vlc_object_t *p_obj, const char *psz_uri,
 
 input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri,
                                 const char *psz_name, int i_options,
-                                const char **ppsz_options, int i_duration,
+                                const char *const *ppsz_options, int i_duration,
                                 int i_type )
 {
     playlist_t *p_playlist = pl_Yield( p_obj );
@@ -233,7 +233,7 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri,
     else if( p_input->i_type == ITEM_TYPE_AFILE
              || p_input->i_type == ITEM_TYPE_VFILE )
     {
-        char *psz_filename = strrchr( p_input->psz_uri, DIR_SEP_CHAR );
+        const char *psz_filename = strrchr( p_input->psz_uri, DIR_SEP_CHAR );
         if( psz_filename && *psz_filename == DIR_SEP_CHAR )
             psz_filename++;
         p_input->psz_name = strdup( psz_filename && *psz_filename

diff --git a/src/playlist/item.c b/src/playlist/item.c
index eefdf86a45355958bb8192c02a534fdee0a37ba3..2810d5522b10fe04590b8825215ae0f87733fe72 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -42,7 +42,7 @@ playlist_item_t * playlist_ItemNewWithType( vlc_object_t *p_obj,
                                             const char *psz_uri,
                                             const char *psz_name,
                                             int i_options,
-                                            const char **ppsz_options,
+                                            const char *const *ppsz_options,
                                             int i_duration, int i_type )
 {
     input_item_t *p_input;
@@ -204,7 +204,7 @@ int playlist_Add( playlist_t *p_playlist, const char *psz_uri,
 */
 int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri,
                      const char *psz_name, int i_mode, int i_pos,
-                     mtime_t i_duration, const char **ppsz_options,
+                     mtime_t i_duration, const char *const *ppsz_options,
                      int i_options, vlc_bool_t b_playlist )
 {
     input_item_t *p_input = input_ItemNewExt( p_playlist, psz_uri, psz_name,
@@ -560,7 +560,7 @@ void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id,
  *****************************************************************************/
 
 /** Set the name of a playlist item */
-int playlist_ItemSetName( playlist_item_t *p_item, char *psz_name )
+int playlist_ItemSetName( playlist_item_t *p_item, const char *psz_name )
 {
     if( psz_name && p_item )
     {