Commit be2365a2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Added a bunch of "const" - should fix warning in VLM GUIs

parent 7db465a8
...@@ -20,12 +20,12 @@ extern "C" { ...@@ -20,12 +20,12 @@ extern "C" {
char * config_GetHomeDir (void); char * config_GetHomeDir (void);
int playlist_ItemDelete (playlist_item_t *); int playlist_ItemDelete (playlist_item_t *);
osd_state_t * __osd_StateChange (osd_state_t *, const int); osd_state_t * __osd_StateChange (osd_state_t *, const int);
int vlm_ScheduleSetup (vlm_schedule_t *, char *, char *); int vlm_ScheduleSetup (vlm_schedule_t *, const char *, const char *);
vlc_acl_t * __ACL_Duplicate (vlc_object_t *p_this, const vlc_acl_t *p_acl); vlc_acl_t * __ACL_Duplicate (vlc_object_t *p_this, const vlc_acl_t *p_acl);
int osd_Slider (vlc_object_t *, spu_t *, int, int, int, int, short); int osd_Slider (vlc_object_t *, spu_t *, int, int, int, int, short);
int playlist_ServicesDiscoveryRemove (playlist_t *, const char *); int playlist_ServicesDiscoveryRemove (playlist_t *, const char *);
int playlist_NodeDelete (playlist_t *, playlist_item_t *, vlc_bool_t , vlc_bool_t); int playlist_NodeDelete (playlist_t *, playlist_item_t *, vlc_bool_t , vlc_bool_t);
void vlm_MediaDelete (vlm_t *, vlm_media_t *, char *); void vlm_MediaDelete (vlm_t *, vlm_media_t *, const char *);
int __var_Destroy (vlc_object_t *, const char *); int __var_Destroy (vlc_object_t *, const char *);
int playlist_ItemSetDuration (playlist_item_t *, mtime_t); int playlist_ItemSetDuration (playlist_item_t *, mtime_t);
void aout_Delete (aout_instance_t *); void aout_Delete (aout_instance_t *);
...@@ -35,7 +35,7 @@ playlist_item_t * playlist_ItemGetByPos (playlist_t *, int); ...@@ -35,7 +35,7 @@ playlist_item_t * playlist_ItemGetByPos (playlist_t *, int);
int playlist_Clear (playlist_t *); int playlist_Clear (playlist_t *);
vout_thread_t * __vout_Create (vlc_object_t *, video_format_t *); vout_thread_t * __vout_Create (vlc_object_t *, video_format_t *);
void aout_FormatPrint (aout_instance_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format); void aout_FormatPrint (aout_instance_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format);
void vlm_ScheduleDelete (vlm_t *, vlm_schedule_t *, char *); void vlm_ScheduleDelete (vlm_t *, vlm_schedule_t *, const char *);
void osd_ConfigUnload (vlc_object_t *, osd_menu_t **); void osd_ConfigUnload (vlc_object_t *, osd_menu_t **);
void input_DecoderDelete (decoder_t *); void input_DecoderDelete (decoder_t *);
void __msg_Info (vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3); void __msg_Info (vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3);
...@@ -64,7 +64,7 @@ httpd_url_t * httpd_UrlNewUnique (httpd_host_t *, const char *psz_url, const cha ...@@ -64,7 +64,7 @@ httpd_url_t * httpd_UrlNewUnique (httpd_host_t *, const char *psz_url, const cha
void httpd_ClientModeStream (httpd_client_t *cl); void httpd_ClientModeStream (httpd_client_t *cl);
void httpd_RedirectDelete (httpd_redirect_t *); void httpd_RedirectDelete (httpd_redirect_t *);
void __sout_CfgParse (vlc_object_t *, char *psz_prefix, const char **ppsz_options, sout_cfg_t *); void __sout_CfgParse (vlc_object_t *, char *psz_prefix, const char **ppsz_options, sout_cfg_t *);
vlm_media_t * vlm_MediaNew (vlm_t *, char *, int); vlm_media_t * vlm_MediaNew (vlm_t *, const char *, int);
int playlist_LockItemToNode (playlist_t *,playlist_item_t *); int playlist_LockItemToNode (playlist_t *,playlist_item_t *);
void spu_Destroy (spu_t *); void spu_Destroy (spu_t *);
int osd_Icon (vlc_object_t *, spu_t *, int, int, int, short); int osd_Icon (vlc_object_t *, spu_t *, int, int, int, short);
...@@ -136,7 +136,7 @@ mtime_t mdate (void); ...@@ -136,7 +136,7 @@ mtime_t mdate (void);
void demux2_Delete (demux_t *); void demux2_Delete (demux_t *);
void __msg_Dbg (vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3); void __msg_Dbg (vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3);
int vlc_getnameinfo (const struct sockaddr *, int, char *, int, int *, int); int vlc_getnameinfo (const struct sockaddr *, int, char *, int, int *, int);
int vlm_ExecuteCommand (vlm_t *, char *, vlm_message_t **); int vlm_ExecuteCommand (vlm_t *, const char *, vlm_message_t **);
char * config_GetUserDir (void); char * config_GetUserDir (void);
httpd_stream_t * httpd_StreamNew (httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl); httpd_stream_t * httpd_StreamNew (httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl);
int __config_GetType (vlc_object_t *, const char *); int __config_GetType (vlc_object_t *, const char *);
...@@ -161,7 +161,7 @@ int vlc_iconv_close (vlc_iconv_t); ...@@ -161,7 +161,7 @@ int vlc_iconv_close (vlc_iconv_t);
int * __net_ListenTCP (vlc_object_t *, const char *, int); int * __net_ListenTCP (vlc_object_t *, const char *, int);
void EndMD5 (struct md5_s *); void EndMD5 (struct md5_s *);
tls_server_t * tls_ServerCreate (vlc_object_t *, const char *, const char *); tls_server_t * tls_ServerCreate (vlc_object_t *, const char *, const char *);
int vlm_MediaSetup (vlm_t *, vlm_media_t *, char *, char *); int vlm_MediaSetup (vlm_t *, vlm_media_t *, const char *, const char *);
void sout_StreamDelete (sout_stream_t *); void sout_StreamDelete (sout_stream_t *);
int vout_ShowTextAbsolute (vout_thread_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t); int vout_ShowTextAbsolute (vout_thread_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t);
void __osd_MenuDelete (vlc_object_t *, osd_menu_t *); void __osd_MenuDelete (vlc_object_t *, osd_menu_t *);
...@@ -187,7 +187,7 @@ void tls_ServerDelete (tls_server_t *); ...@@ -187,7 +187,7 @@ void tls_ServerDelete (tls_server_t *);
unsigned int aout_FormatNbChannels (const audio_sample_format_t * p_format); unsigned int aout_FormatNbChannels (const audio_sample_format_t * p_format);
int __vlc_mutex_destroy (char *, int, vlc_mutex_t *); int __vlc_mutex_destroy (char *, int, vlc_mutex_t *);
vlc_bool_t playlist_IsServicesDiscoveryLoaded (playlist_t *,const char *); vlc_bool_t playlist_IsServicesDiscoveryLoaded (playlist_t *,const char *);
int vlm_Save (vlm_t *, char *); int vlm_Save (vlm_t *, const char *);
int ACL_AddNet (vlc_acl_t *p_acl, const char *psz_ip, int i_len, vlc_bool_t b_allow); int ACL_AddNet (vlc_acl_t *p_acl, const char *psz_ip, int i_len, vlc_bool_t b_allow);
void AddMD5 (struct md5_s *, const uint8_t *, uint32_t); void AddMD5 (struct md5_s *, const uint8_t *, uint32_t);
void config_Duplicate (module_t *, module_config_t *); void config_Duplicate (module_t *, module_config_t *);
...@@ -354,11 +354,11 @@ void vlc_list_release (vlc_list_t *); ...@@ -354,11 +354,11 @@ void vlc_list_release (vlc_list_t *);
subpicture_t * spu_SortSubpictures (spu_t *, mtime_t); subpicture_t * spu_SortSubpictures (spu_t *, mtime_t);
playlist_item_t * playlist_LockItemGetByInput (playlist_t *,input_item_t *); playlist_item_t * playlist_LockItemGetByInput (playlist_t *,input_item_t *);
int __net_vaPrintf (vlc_object_t *p_this, int fd, v_socket_t *, const char *psz_fmt, va_list args); int __net_vaPrintf (vlc_object_t *p_this, int fd, v_socket_t *, const char *psz_fmt, va_list args);
int vlm_MediaControl (vlm_t *, vlm_media_t *, char *, char *, char *); int vlm_MediaControl (vlm_t *, vlm_media_t *, const char *, const char *, const char *);
vlc_bool_t vout_SynchroChoose (vout_synchro_t *, int, int, vlc_bool_t); vlc_bool_t vout_SynchroChoose (vout_synchro_t *, int, int, vlc_bool_t);
int playlist_RecursiveNodeSort (playlist_t *, playlist_item_t *,int, int); int playlist_RecursiveNodeSort (playlist_t *, playlist_item_t *,int, int);
int64_t vlc_atoll (const char *nptr); int64_t vlc_atoll (const char *nptr);
int vlm_MediaVodControl (void *, vod_media_t *, char *, int, va_list); int vlm_MediaVodControl (void *, vod_media_t *, const char *, int, va_list);
void __vlc_object_destroy (vlc_object_t *); void __vlc_object_destroy (vlc_object_t *);
int sout_AccessOutSeek (sout_access_out_t *, off_t); int sout_AccessOutSeek (sout_access_out_t *, off_t);
double vlc_atof (const char *nptr); double vlc_atof (const char *nptr);
...@@ -373,7 +373,7 @@ int __vlc_cond_destroy (char *, int, vlc_cond_t *); ...@@ -373,7 +373,7 @@ int __vlc_cond_destroy (char *, int, vlc_cond_t *);
httpd_handler_t * httpd_HandlerNew (httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_handler_callback_t pf_fill, httpd_handler_sys_t *); httpd_handler_t * httpd_HandlerNew (httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_handler_callback_t pf_fill, httpd_handler_sys_t *);
vlc_list_t * __vlc_list_find (vlc_object_t *, int, int); vlc_list_t * __vlc_list_find (vlc_object_t *, int, int);
char * ToLocale (const char *); char * ToLocale (const char *);
int vlm_Load (vlm_t *, char *); int vlm_Load (vlm_t *, const char *);
int aout_FiltersCreatePipeline (aout_instance_t * p_aout, aout_filter_t ** pp_filters, int * pi_nb_filters, const audio_sample_format_t * p_input_format, const audio_sample_format_t * p_output_format); int aout_FiltersCreatePipeline (aout_instance_t * p_aout, aout_filter_t ** pp_filters, int * pi_nb_filters, const audio_sample_format_t * p_input_format, const audio_sample_format_t * p_output_format);
playlist_item_t * playlist_ChildSearchName (playlist_item_t*, const char*); playlist_item_t * playlist_ChildSearchName (playlist_item_t*, const char*);
void __msg_GenericVa (vlc_object_t *, int, const char *, const char *, va_list args); void __msg_GenericVa (vlc_object_t *, int, const char *, const char *, va_list args);
...@@ -382,7 +382,7 @@ char const * vlc_error (int); ...@@ -382,7 +382,7 @@ char const * vlc_error (int);
int playlist_NodeGroup (playlist_t *, int,playlist_item_t *,playlist_item_t **,int, int, int); int playlist_NodeGroup (playlist_t *, int,playlist_item_t *,playlist_item_t **,int, int, int);
playlist_item_t* playlist_ItemNewWithType (vlc_object_t *,const char *,const char *, int); playlist_item_t* playlist_ItemNewWithType (vlc_object_t *,const char *,const char *, int);
void __config_PutPsz (vlc_object_t *, const char *, const char *); void __config_PutPsz (vlc_object_t *, const char *, const char *);
vlm_schedule_t * vlm_ScheduleNew (vlm_t *, char *); vlm_schedule_t * vlm_ScheduleNew (vlm_t *, const char *);
int osd_ShowTextAbsolute (spu_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t); int osd_ShowTextAbsolute (spu_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t);
void net_Close (int fd); void net_Close (int fd);
int __vlc_threads_init (vlc_object_t *); int __vlc_threads_init (vlc_object_t *);
...@@ -772,18 +772,18 @@ struct module_symbols_t ...@@ -772,18 +772,18 @@ struct module_symbols_t
int (*__vout_AllocatePicture_inner) (vlc_object_t *p_this, picture_t *p_pic, uint32_t i_chroma, int i_width, int i_height, int i_aspect); int (*__vout_AllocatePicture_inner) (vlc_object_t *p_this, picture_t *p_pic, uint32_t i_chroma, int i_width, int i_height, int i_aspect);
vlm_t * (*__vlm_New_inner) (vlc_object_t *); vlm_t * (*__vlm_New_inner) (vlc_object_t *);
void (*vlm_Delete_inner) (vlm_t *); void (*vlm_Delete_inner) (vlm_t *);
int (*vlm_ExecuteCommand_inner) (vlm_t *, char *, vlm_message_t **); int (*vlm_ExecuteCommand_inner) (vlm_t *, const char *, vlm_message_t **);
void (*vlm_MessageDelete_inner) (vlm_message_t *); void (*vlm_MessageDelete_inner) (vlm_message_t *);
vlm_media_t * (*vlm_MediaNew_inner) (vlm_t *, char *, int); vlm_media_t * (*vlm_MediaNew_inner) (vlm_t *, const char *, int);
void (*vlm_MediaDelete_inner) (vlm_t *, vlm_media_t *, char *); void (*vlm_MediaDelete_inner) (vlm_t *, vlm_media_t *, const char *);
int (*vlm_MediaSetup_inner) (vlm_t *, vlm_media_t *, char *, char *); int (*vlm_MediaSetup_inner) (vlm_t *, vlm_media_t *, const char *, const char *);
int (*vlm_MediaControl_inner) (vlm_t *, vlm_media_t *, char *, char *, char *); int (*vlm_MediaControl_inner) (vlm_t *, vlm_media_t *, const char *, const char *, const char *);
vlm_schedule_t * (*vlm_ScheduleNew_inner) (vlm_t *, char *); vlm_schedule_t * (*vlm_ScheduleNew_inner) (vlm_t *, const char *);
void (*vlm_ScheduleDelete_inner) (vlm_t *, vlm_schedule_t *, char *); void (*vlm_ScheduleDelete_inner) (vlm_t *, vlm_schedule_t *, const char *);
int (*vlm_ScheduleSetup_inner) (vlm_schedule_t *, char *, char *); int (*vlm_ScheduleSetup_inner) (vlm_schedule_t *, const char *, const char *);
int (*vlm_MediaVodControl_inner) (void *, vod_media_t *, char *, int, va_list); int (*vlm_MediaVodControl_inner) (void *, vod_media_t *, const char *, int, va_list);
int (*vlm_Save_inner) (vlm_t *, char *); int (*vlm_Save_inner) (vlm_t *, const char *);
int (*vlm_Load_inner) (vlm_t *, char *); int (*vlm_Load_inner) (vlm_t *, const char *);
xml_t * (*__xml_Create_inner) (vlc_object_t *); xml_t * (*__xml_Create_inner) (vlc_object_t *);
void (*xml_Delete_inner) (xml_t *); void (*xml_Delete_inner) (xml_t *);
vout_synchro_t * (*__vout_SynchroInit_inner) (vlc_object_t *, int); vout_synchro_t * (*__vout_SynchroInit_inner) (vlc_object_t *, int);
......
...@@ -133,17 +133,17 @@ struct vlm_t ...@@ -133,17 +133,17 @@ struct vlm_t
#define vlm_New( a ) __vlm_New( VLC_OBJECT(a) ) #define vlm_New( a ) __vlm_New( VLC_OBJECT(a) )
VLC_EXPORT( vlm_t *, __vlm_New, ( vlc_object_t * ) ); VLC_EXPORT( vlm_t *, __vlm_New, ( vlc_object_t * ) );
VLC_EXPORT( void, vlm_Delete, ( vlm_t * ) ); VLC_EXPORT( void, vlm_Delete, ( vlm_t * ) );
VLC_EXPORT( int, vlm_ExecuteCommand, ( vlm_t *, char *, vlm_message_t ** ) ); VLC_EXPORT( int, vlm_ExecuteCommand, ( vlm_t *, const char *, vlm_message_t ** ) );
VLC_EXPORT( void, vlm_MessageDelete, ( vlm_message_t * ) ); VLC_EXPORT( void, vlm_MessageDelete, ( vlm_message_t * ) );
VLC_EXPORT( vlm_media_t *, vlm_MediaNew, ( vlm_t *, char *, int ) ); VLC_EXPORT( vlm_media_t *, vlm_MediaNew, ( vlm_t *, const char *, int ) );
VLC_EXPORT( void, vlm_MediaDelete, ( vlm_t *, vlm_media_t *, char * ) ); VLC_EXPORT( void, vlm_MediaDelete, ( vlm_t *, vlm_media_t *, const char * ) );
VLC_EXPORT( int, vlm_MediaSetup, ( vlm_t *, vlm_media_t *, char *, char * ) ); VLC_EXPORT( int, vlm_MediaSetup, ( vlm_t *, vlm_media_t *, const char *, const char * ) );
VLC_EXPORT( int, vlm_MediaControl, ( vlm_t *, vlm_media_t *, char *, char *, char * ) ); VLC_EXPORT( int, vlm_MediaControl, ( vlm_t *, vlm_media_t *, const char *, const char *, const char * ) );
VLC_EXPORT( vlm_schedule_t *, vlm_ScheduleNew, ( vlm_t *, char * ) ); VLC_EXPORT( vlm_schedule_t *, vlm_ScheduleNew, ( vlm_t *, const char * ) );
VLC_EXPORT( void, vlm_ScheduleDelete, ( vlm_t *, vlm_schedule_t *, char * ) ); VLC_EXPORT( void, vlm_ScheduleDelete, ( vlm_t *, vlm_schedule_t *, const char * ) );
VLC_EXPORT( int, vlm_ScheduleSetup, ( vlm_schedule_t *, char *, char * ) ); VLC_EXPORT( int, vlm_ScheduleSetup, ( vlm_schedule_t *, const char *, const char * ) );
VLC_EXPORT( int, vlm_MediaVodControl, ( void *, vod_media_t *, char *, int, va_list ) ); VLC_EXPORT( int, vlm_MediaVodControl, ( void *, vod_media_t *, const char *, int, va_list ) );
VLC_EXPORT( int, vlm_Save, ( vlm_t *, char * ) ); VLC_EXPORT( int, vlm_Save, ( vlm_t *, const char * ) );
VLC_EXPORT( int, vlm_Load, ( vlm_t *, char * ) ); VLC_EXPORT( int, vlm_Load, ( vlm_t *, const char * ) );
#endif #endif
...@@ -32,13 +32,13 @@ struct vod_t ...@@ -32,13 +32,13 @@ struct vod_t
module_t *p_module; module_t *p_module;
vod_sys_t *p_sys; vod_sys_t *p_sys;
vod_media_t * (*pf_media_new) ( vod_t *, char *, input_item_t * ); vod_media_t * (*pf_media_new) ( vod_t *, const char *, input_item_t * );
void (*pf_media_del) ( vod_t *, vod_media_t * ); void (*pf_media_del) ( vod_t *, vod_media_t * );
int (*pf_media_add_es)( vod_t *, vod_media_t *, es_format_t * ); int (*pf_media_add_es)( vod_t *, vod_media_t *, es_format_t * );
void (*pf_media_del_es)( vod_t *, vod_media_t *, es_format_t * ); void (*pf_media_del_es)( vod_t *, vod_media_t *, es_format_t * );
/* Owner properties */ /* Owner properties */
int (*pf_media_control) ( void *, vod_media_t *, char *, int, va_list ); int (*pf_media_control) ( void *, vod_media_t *, const char *, int, va_list );
void *p_data; void *p_data;
}; };
......
...@@ -156,7 +156,7 @@ struct vod_sys_t ...@@ -156,7 +156,7 @@ struct vod_sys_t
vod_media_t **media; vod_media_t **media;
}; };
static vod_media_t *MediaNew( vod_t *, char *, input_item_t * ); static vod_media_t *MediaNew( vod_t *, const char *, input_item_t * );
static void MediaDel( vod_t *, vod_media_t * ); static void MediaDel( vod_t *, vod_media_t * );
static int MediaAddES( vod_t *, vod_media_t *, es_format_t * ); static int MediaAddES( vod_t *, vod_media_t *, es_format_t * );
static void MediaDelES( vod_t *, vod_media_t *, es_format_t * ); static void MediaDelES( vod_t *, vod_media_t *, es_format_t * );
...@@ -254,7 +254,7 @@ static void Close( vlc_object_t * p_this ) ...@@ -254,7 +254,7 @@ static void Close( vlc_object_t * p_this )
/***************************************************************************** /*****************************************************************************
* Media handling * Media handling
*****************************************************************************/ *****************************************************************************/
static vod_media_t *MediaNew( vod_t *p_vod, char *psz_name, static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name,
input_item_t *p_item ) input_item_t *p_item )
{ {
vod_sys_t *p_sys = p_vod->p_sys; vod_sys_t *p_sys = p_vod->p_sys;
......
...@@ -53,17 +53,17 @@ ...@@ -53,17 +53,17 @@
static vlm_message_t *vlm_Show( vlm_t *, vlm_media_t *, vlm_schedule_t *, char * ); static vlm_message_t *vlm_Show( vlm_t *, vlm_media_t *, vlm_schedule_t *, char * );
static vlm_message_t *vlm_Help( vlm_t *, char * ); static vlm_message_t *vlm_Help( vlm_t *, char * );
static vlm_media_t *vlm_MediaSearch ( vlm_t *, char * ); static vlm_media_t *vlm_MediaSearch ( vlm_t *, const char * );
static vlm_media_instance_t *vlm_MediaInstanceSearch( vlm_t *, vlm_media_t *, char * ); static vlm_media_instance_t *vlm_MediaInstanceSearch( vlm_t *, vlm_media_t *, const char * );
static vlm_message_t *vlm_MessageNew( char *, const char *, ... ); static vlm_message_t *vlm_MessageNew( char *, const char *, ... );
static vlm_message_t *vlm_MessageAdd( vlm_message_t *, vlm_message_t * ); static vlm_message_t *vlm_MessageAdd( vlm_message_t *, vlm_message_t * );
static vlm_schedule_t *vlm_ScheduleSearch( vlm_t *, char * ); static vlm_schedule_t *vlm_ScheduleSearch( vlm_t *, const char * );
static char *Save( vlm_t * ); static char *Save( vlm_t * );
static int Load( vlm_t *, char * ); static int Load( vlm_t *, char * );
static int ExecuteCommand( vlm_t *, char *, vlm_message_t ** ); static int ExecuteCommand( vlm_t *, const char *, vlm_message_t ** );
static int Manage( vlc_object_t * ); static int Manage( vlc_object_t * );
/***************************************************************************** /*****************************************************************************
...@@ -172,7 +172,7 @@ void vlm_Delete( vlm_t *p_vlm ) ...@@ -172,7 +172,7 @@ void vlm_Delete( vlm_t *p_vlm )
/***************************************************************************** /*****************************************************************************
* vlm_ExecuteCommand: * vlm_ExecuteCommand:
*****************************************************************************/ *****************************************************************************/
int vlm_ExecuteCommand( vlm_t *p_vlm, char *psz_command, int vlm_ExecuteCommand( vlm_t *p_vlm, const char *psz_command,
vlm_message_t **pp_message) vlm_message_t **pp_message)
{ {
int i_result; int i_result;
...@@ -187,7 +187,7 @@ int vlm_ExecuteCommand( vlm_t *p_vlm, char *psz_command, ...@@ -187,7 +187,7 @@ int vlm_ExecuteCommand( vlm_t *p_vlm, char *psz_command,
/***************************************************************************** /*****************************************************************************
* vlm_Save: * vlm_Save:
*****************************************************************************/ *****************************************************************************/
int vlm_Save( vlm_t *p_vlm, char *psz_file ) int vlm_Save( vlm_t *p_vlm, const char *psz_file )
{ {
FILE *file; FILE *file;
char *psz_save; char *psz_save;
...@@ -213,7 +213,7 @@ int vlm_Save( vlm_t *p_vlm, char *psz_file ) ...@@ -213,7 +213,7 @@ int vlm_Save( vlm_t *p_vlm, char *psz_file )
/***************************************************************************** /*****************************************************************************
* vlm_Load: * vlm_Load:
*****************************************************************************/ *****************************************************************************/
int vlm_Load( vlm_t *p_vlm, char *psz_file ) int vlm_Load( vlm_t *p_vlm, const char *psz_file )
{ {
FILE *file; FILE *file;
int64_t i_size; int64_t i_size;
...@@ -256,10 +256,8 @@ int vlm_Load( vlm_t *p_vlm, char *psz_file ) ...@@ -256,10 +256,8 @@ int vlm_Load( vlm_t *p_vlm, char *psz_file )
/***************************************************************************** /*****************************************************************************
* FindEndCommand * FindEndCommand
*****************************************************************************/ *****************************************************************************/
static char *FindEndCommand( char *psz ) static const char *FindEndCommand( const char *psz_sent )
{ {
char *psz_sent = psz;
switch( *psz_sent ) switch( *psz_sent )
{ {
case '\"': case '\"':
...@@ -330,12 +328,12 @@ static char *FindEndCommand( char *psz ) ...@@ -330,12 +328,12 @@ static char *FindEndCommand( char *psz )
***************************************************************************** *****************************************************************************
* Execute a command which ends with '\0' (string) * Execute a command which ends with '\0' (string)
*****************************************************************************/ *****************************************************************************/
static int ExecuteCommand( vlm_t *p_vlm, char *psz_command, static int ExecuteCommand( vlm_t *p_vlm, const char *psz_command,
vlm_message_t **pp_message ) vlm_message_t **pp_message )
{ {
int i_command = 0; int i_command = 0;
char **ppsz_command = NULL; char **ppsz_command = NULL;
char *psz_cmd = psz_command; const char *psz_cmd = psz_command;
vlm_message_t *p_message = NULL; vlm_message_t *p_message = NULL;
int i, j; int i, j;
...@@ -349,7 +347,7 @@ static int ExecuteCommand( vlm_t *p_vlm, char *psz_command, ...@@ -349,7 +347,7 @@ static int ExecuteCommand( vlm_t *p_vlm, char *psz_command,
} }
else else
{ {
char *psz_temp; const char *psz_temp;
int i_temp; int i_temp;
/* support for comments */ /* support for comments */
...@@ -807,7 +805,7 @@ error: ...@@ -807,7 +805,7 @@ error:
return VLC_EGENERIC; return VLC_EGENERIC;
} }
static vlm_media_t *vlm_MediaSearch( vlm_t *vlm, char *psz_name ) static vlm_media_t *vlm_MediaSearch( vlm_t *vlm, const char *psz_name )
{ {
int i; int i;
...@@ -826,7 +824,8 @@ static vlm_media_t *vlm_MediaSearch( vlm_t *vlm, char *psz_name ) ...@@ -826,7 +824,8 @@ static vlm_media_t *vlm_MediaSearch( vlm_t *vlm, char *psz_name )
* Media handling * Media handling
*****************************************************************************/ *****************************************************************************/
static vlm_media_instance_t * static vlm_media_instance_t *
vlm_MediaInstanceSearch( vlm_t *vlm, vlm_media_t *media, char *psz_name ) vlm_MediaInstanceSearch( vlm_t *vlm, vlm_media_t *media,
const char *psz_name )
{ {
int i; int i;
...@@ -843,7 +842,7 @@ vlm_MediaInstanceSearch( vlm_t *vlm, vlm_media_t *media, char *psz_name ) ...@@ -843,7 +842,7 @@ vlm_MediaInstanceSearch( vlm_t *vlm, vlm_media_t *media, char *psz_name )
return NULL; return NULL;
} }
vlm_media_t *vlm_MediaNew( vlm_t *vlm, char *psz_name, int i_type ) vlm_media_t *vlm_MediaNew( vlm_t *vlm, const char *psz_name, int i_type )
{ {
vlm_media_t *media = malloc( sizeof( vlm_media_t ) ); vlm_media_t *media = malloc( sizeof( vlm_media_t ) );
...@@ -899,7 +898,7 @@ vlm_media_t *vlm_MediaNew( vlm_t *vlm, char *psz_name, int i_type ) ...@@ -899,7 +898,7 @@ vlm_media_t *vlm_MediaNew( vlm_t *vlm, char *psz_name, int i_type )
} }
/* for now, simple delete. After, del with options (last arg) */ /* for now, simple delete. After, del with options (last arg) */
void vlm_MediaDelete( vlm_t *vlm, vlm_media_t *media, char *psz_name ) void vlm_MediaDelete( vlm_t *vlm, vlm_media_t *media, const char *psz_name )
{ {
if( media == NULL ) return; if( media == NULL ) return;
...@@ -944,8 +943,8 @@ void vlm_MediaDelete( vlm_t *vlm, vlm_media_t *media, char *psz_name ) ...@@ -944,8 +943,8 @@ void vlm_MediaDelete( vlm_t *vlm, vlm_media_t *media, char *psz_name )
free( media ); free( media );
} }
int vlm_MediaSetup( vlm_t *vlm, vlm_media_t *media, char *psz_cmd, int vlm_MediaSetup( vlm_t *vlm, vlm_media_t *media, const char *psz_cmd,
char *psz_value ) const char *psz_value )
{ {
if( !psz_cmd) return VLC_EGENERIC; if( !psz_cmd) return VLC_EGENERIC;
...@@ -1133,8 +1132,8 @@ int vlm_MediaSetup( vlm_t *vlm, vlm_media_t *media, char *psz_cmd, ...@@ -1133,8 +1132,8 @@ int vlm_MediaSetup( vlm_t *vlm, vlm_media_t *media, char *psz_cmd,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
int vlm_MediaControl( vlm_t *vlm, vlm_media_t *media, char *psz_id, int vlm_MediaControl( vlm_t *vlm, vlm_media_t *media, const char *psz_id,
char *psz_command, char *psz_args ) const char *psz_command, const char *psz_args )
{ {
vlm_media_instance_t *p_instance; vlm_media_instance_t *p_instance;
int i; int i;
...@@ -1270,7 +1269,7 @@ static int64_t vlm_Date() ...@@ -1270,7 +1269,7 @@ static int64_t vlm_Date()
#endif #endif
} }
vlm_schedule_t *vlm_ScheduleNew( vlm_t *vlm, char *psz_name ) vlm_schedule_t *vlm_ScheduleNew( vlm_t *vlm, const char *psz_name )
{ {
vlm_schedule_t *p_sched = malloc( sizeof( vlm_schedule_t ) ); vlm_schedule_t *p_sched = malloc( sizeof( vlm_schedule_t ) );
...@@ -1299,7 +1298,7 @@ vlm_schedule_t *vlm_ScheduleNew( vlm_t *vlm, char *psz_name ) ...@@ -1299,7 +1298,7 @@ vlm_schedule_t *vlm_ScheduleNew( vlm_t *vlm, char *psz_name )
/* for now, simple delete. After, del with options (last arg) */ /* for now, simple delete. After, del with options (last arg) */
void vlm_ScheduleDelete( vlm_t *vlm, vlm_schedule_t *sched, void vlm_ScheduleDelete( vlm_t *vlm, vlm_schedule_t *sched,
char *psz_name ) const char *psz_name )
{ {
if( sched == NULL ) return; if( sched == NULL ) return;
...@@ -1311,7 +1310,7 @@ void vlm_ScheduleDelete( vlm_t *vlm, vlm_schedule_t *sched, ...@@ -1311,7 +1310,7 @@ void vlm_ScheduleDelete( vlm_t *vlm, vlm_schedule_t *sched,
free( sched ); free( sched );
} }
static vlm_schedule_t *vlm_ScheduleSearch( vlm_t *vlm, char *psz_name ) static vlm_schedule_t *vlm_ScheduleSearch( vlm_t *vlm, const char *psz_name )
{ {
int i; int i;
...@@ -1327,8 +1326,8 @@ static vlm_schedule_t *vlm_ScheduleSearch( vlm_t *vlm, char *psz_name ) ...@@ -1327,8 +1326,8 @@ static vlm_schedule_t *vlm_ScheduleSearch( vlm_t *vlm, char *psz_name )
} }
/* Ok, setup schedule command will be able to support only one (argument value) at a time */ /* Ok, setup schedule command will be able to support only one (argument value) at a time */
int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd, int vlm_ScheduleSetup( vlm_schedule_t *schedule, const char *psz_cmd,
char *psz_value ) const char *psz_value )
{ {
if( !strcmp( psz_cmd, "enabled" ) ) if( !strcmp( psz_cmd, "enabled" ) )
{ {
...@@ -1342,7 +1341,7 @@ int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd, ...@@ -1342,7 +1341,7 @@ int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd,
else if( !strcmp( psz_cmd, "date" ) ) else if( !strcmp( psz_cmd, "date" ) )
{ {
struct tm time; struct tm time;
char *p; const char *p;
time_t date; time_t date;
time.tm_sec = 0; /* seconds */ time.tm_sec = 0; /* seconds */
...@@ -1368,9 +1367,9 @@ int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd, ...@@ -1368,9 +1367,9 @@ int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd,
} }
else else
{ {
int i,j,k; unsigned i,j,k;
switch( sscanf( p + 1, "%d:%d:%d", &i, &j, &k ) ) switch( sscanf( p + 1, "%u:%u:%u", &i, &j, &k ) )
{ {
case 1: case 1:
time.tm_sec = i; time.tm_sec = i;
...@@ -1388,8 +1387,6 @@ int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd, ...@@ -1388,8 +1387,6 @@ int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd,
return 1; return 1;
} }
*p = '\0';
switch( sscanf( psz_value, "%d/%d/%d", &i, &j, &k ) ) switch( sscanf( psz_value, "%d/%d/%d", &i, &j, &k ) )
{ {
case 1: case 1:
...@@ -1415,10 +1412,10 @@ int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd, ...@@ -1415,10 +1412,10 @@ int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd,
else if( !strcmp( psz_cmd, "period" ) ) else if( !strcmp( psz_cmd, "period" ) )
{ {
struct tm time; struct tm time;
char *p; const char *p;
char *psz_time = NULL, *psz_date = NULL; const char *psz_time = NULL, *psz_date = NULL;
time_t date; time_t date;
int i,j,k; unsigned i,j,k;
/* First, if date or period are modified, repeat should be equal to -1 */ /* First, if date or period are modified, repeat should be equal to -1 */
schedule->i_repeat = -1; schedule->i_repeat = -1;
...@@ -1439,8 +1436,6 @@ int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd, ...@@ -1439,8 +1436,6 @@ int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd,
{ {
psz_date = psz_value; psz_date = psz_value;
psz_time = p + 1; psz_time = p + 1;
*p = '\0';
} }
else else
{ {
...@@ -1448,7 +1443,7 @@ int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd, ...@@ -1448,7 +1443,7 @@ int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd,
} }
switch( sscanf( psz_time, "%d:%d:%d", &i, &j, &k ) ) switch( sscanf( psz_time, "%u:%u:%u", &i, &j, &k ) )
{ {
case 1: case 1:
time.tm_sec = i; time.tm_sec = i;
...@@ -1467,7 +1462,7 @@ int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd, ...@@ -1467,7 +1462,7 @@ int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd,
} }
if( psz_date ) if( psz_date )
{ {
switch( sscanf( psz_date, "%d/%d/%d", &i, &j, &k ) ) switch( sscanf( psz_date, "%u/%u/%u", &i, &j, &k ) )
{ {
case 1: case 1:
time.tm_mday = i; time.tm_mday = i;
...@@ -2221,7 +2216,7 @@ static char *Save( vlm_t *vlm ) ...@@ -2221,7 +2216,7 @@ static char *Save( vlm_t *vlm )
* Manage: * Manage:
*****************************************************************************/ *****************************************************************************/
int vlm_MediaVodControl( void *p_private, vod_media_t *p_vod_media, int vlm_MediaVodControl( void *p_private, vod_media_t *p_vod_media,
char *psz_id, int i_query, va_list args ) const char *psz_id, int i_query, va_list args )
{ {
vlm_t *vlm = (vlm_t *)p_private; vlm_t *vlm = (vlm_t *)p_private;
int i, i_ret = VLC_EGENERIC; int i, i_ret = VLC_EGENERIC;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment