# HG changeset patch
# User reynaldo
# Date 1152979392 0
# Node ID 2ec2301183cdb66019b112c0923e49321c307382
# Parent  4611423138fc0298908f4508b6cd992bde57ef21
marks several read-only string parameters which aren't modified inside the called function as const. Patch by Stefan Huehner, stefan AT huehner-org

diff -r 4611423138fc -r 2ec2301183cd Gui/mplayer/mw.c
--- a/Gui/mplayer/mw.c	Sat Jul 15 15:27:09 2006 +0000
+++ b/Gui/mplayer/mw.c	Sat Jul 15 16:03:12 2006 +0000
@@ -73,7 +73,7 @@
 // XFlush( wsDisplay );
 }
 
-extern void exit_player(char* how);
+extern void exit_player(const char* how);
 extern int vcd_track;
 static unsigned last_redraw_time = 0;
 
diff -r 4611423138fc -r 2ec2301183cd Gui/skin/font.c
--- a/Gui/skin/font.c	Sat Jul 15 15:27:09 2006 +0000
+++ b/Gui/skin/font.c	Sat Jul 15 16:03:12 2006 +0000
@@ -146,7 +146,7 @@
  return max;
 }
 
-txSample * fntRender( wItem * item,int px,char * fmt,... )
+txSample * fntRender( wItem * item,int px,const char * fmt,... )
 {
  va_list         ap;
  unsigned char   p[512];
diff -r 4611423138fc -r 2ec2301183cd Gui/skin/font.h
--- a/Gui/skin/font.h	Sat Jul 15 15:27:09 2006 +0000
+++ b/Gui/skin/font.h	Sat Jul 15 16:03:12 2006 +0000
@@ -32,7 +32,7 @@
 extern int  fntTextWidth( int id,char * str );
 
 extern int        fntRead( char * path,char * fname );
-extern txSample * fntRender( wItem * item,int px,char * fmt,... );
+extern txSample * fntRender( wItem * item,int px,const char * fmt,... );
 
 #endif
 
diff -r 4611423138fc -r 2ec2301183cd Gui/win32/interface.c
--- a/Gui/win32/interface.c	Sat Jul 15 15:27:09 2006 +0000
+++ b/Gui/win32/interface.c	Sat Jul 15 16:03:12 2006 +0000
@@ -45,7 +45,7 @@
 extern m_obj_settings_t* vo_plugin_args;
 extern vo_functions_t *video_out;
 extern ao_functions_t *audio_out;
-extern void exit_player(char *how);
+extern void exit_player(const char *how);
 extern char *filename;
 extern int abs_seek_pos;
 extern float rel_seek_secs;
diff -r 4611423138fc -r 2ec2301183cd asxparser.c
--- a/asxparser.c	Sat Jul 15 15:27:09 2006 +0000
+++ b/asxparser.c	Sat Jul 15 16:03:12 2006 +0000
@@ -80,7 +80,7 @@
 /////// Attribs utils
 
 char*
-asx_get_attrib(char* attrib,char** attribs) {
+asx_get_attrib(const char* attrib,char** attribs) {
   char** ptr;
 
   if(attrib == NULL || attribs == NULL) return NULL;
diff -r 4611423138fc -r 2ec2301183cd asxparser.h
--- a/asxparser.h	Sat Jul 15 15:27:09 2006 +0000
+++ b/asxparser.h	Sat Jul 15 16:03:12 2006 +0000
@@ -34,7 +34,7 @@
 /////// Attribs utils
 
 char*
-asx_get_attrib(char* attrib,char** attribs);
+asx_get_attrib(const char* attrib,char** attribs);
 
 int
 asx_attrib_to_enum(const char* val,char** valid_vals);
diff -r 4611423138fc -r 2ec2301183cd libass/ass_render.c
--- a/libass/ass_render.c	Sat Jul 15 15:27:09 2006 +0000
+++ b/libass/ass_render.c	Sat Jul 15 16:03:12 2006 +0000
@@ -469,7 +469,7 @@
 /**
  * \brief Check if starting part of (*p) matches sample. If true, shift p to the first symbol after the matching part.
  */
-static inline int mystrcmp(char** p, char* sample) {
+static inline int mystrcmp(char** p, const char* sample) {
 	int len = strlen(sample);
 	if (strncmp(*p, sample, len) == 0) {
 		(*p) += len;
diff -r 4611423138fc -r 2ec2301183cd libmpcodecs/ad_libvorbis.c
--- a/libmpcodecs/ad_libvorbis.c	Sat Jul 15 15:27:09 2006 +0000
+++ b/libmpcodecs/ad_libvorbis.c	Sat Jul 15 16:03:12 2006 +0000
@@ -38,7 +38,7 @@
 #endif
 } ov_struct_t;
 
-static int read_vorbis_comment( char* ptr, char* comment, char* format, ... ) {
+static int read_vorbis_comment( char* ptr, const char* comment, const char* format, ... ) {
   va_list va;
   int clen, ret;
 
diff -r 4611423138fc -r 2ec2301183cd libmpcodecs/ve_x264.c
--- a/libmpcodecs/ve_x264.c	Sat Jul 15 15:27:09 2006 +0000
+++ b/libmpcodecs/ve_x264.c	Sat Jul 15 16:03:12 2006 +0000
@@ -208,7 +208,7 @@
 };
 
 static int parse_cqm(const char *str, uint8_t *cqm, int length,
-                     h264_module_t *mod, char *matrix_name) {
+                     h264_module_t *mod, const char *matrix_name) {
     int i;
     if (!str) return 0;
     for (i = 0; i < length; i++) {
diff -r 4611423138fc -r 2ec2301183cd libmpdemux/demux_ty_osd.c
--- a/libmpdemux/demux_ty_osd.c	Sat Jul 15 15:27:09 2006 +0000
+++ b/libmpdemux/demux_ty_osd.c	Sat Jul 15 16:03:12 2006 +0000
@@ -475,7 +475,7 @@
 static int ty_XDSDisplayCount = -1;
 
 
-static void ty_AddXDSToDisplay( char *format, ... )
+static void ty_AddXDSToDisplay( const char *format, ... )
 {
    char line[ 80 ];
    int  index;
diff -r 4611423138fc -r 2ec2301183cd m_property.h
--- a/m_property.h	Sat Jul 15 15:27:09 2006 +0000
+++ b/m_property.h	Sat Jul 15 16:03:12 2006 +0000
@@ -123,7 +123,7 @@
 m_option_t*  mp_property_find(const char* name);
 
 /// Do an action with an MPlayer property.
-int mp_property_do(char* name,int action, void* val);
+int mp_property_do(const char* name,int action, void* val);
 
 /// \defgroup PropertyImplHelper Property implementation helpers
 /// \ingroup Properties
diff -r 4611423138fc -r 2ec2301183cd m_struct.c
--- a/m_struct.c	Sat Jul 15 15:27:09 2006 +0000
+++ b/m_struct.c	Sat Jul 15 16:03:12 2006 +0000
@@ -12,7 +12,7 @@
 #include "mp_msg.h"
 
 m_option_t*
-m_struct_get_field(m_struct_t* st,char* f) {
+m_struct_get_field(m_struct_t* st,const char* f) {
   int i;
 
   for(i = 0 ; st->fields[i].name ; i++) {
@@ -70,7 +70,7 @@
 }
 
 void
-m_struct_reset(m_struct_t* st, void* obj, char* field) {
+m_struct_reset(m_struct_t* st, void* obj, const char* field) {
   m_option_t* f;
 
   if(!field) { // Reset all options
diff -r 4611423138fc -r 2ec2301183cd m_struct.h
--- a/m_struct.h	Sat Jul 15 15:27:09 2006 +0000
+++ b/m_struct.h	Sat Jul 15 16:03:12 2006 +0000
@@ -78,7 +78,7 @@
  *  \param field Name of the field to reset, if NULL all fields are reseted.
  */
 void
-m_struct_reset(m_struct_t* st, void* obj, char* field);
+m_struct_reset(m_struct_t* st, void* obj, const char* field);
 
 /// Create a copy of an existing struct.
 /** \param st Struct definiton.
@@ -101,7 +101,7 @@
  *  \return The \ref m_option struct describing the field or NULL if not found.
  */
 struct m_option*
-m_struct_get_field(m_struct_t* st,char* f);
+m_struct_get_field(m_struct_t* st,const char* f);
 
 ///@}
 
diff -r 4611423138fc -r 2ec2301183cd mplayer.c
--- a/mplayer.c	Sat Jul 15 15:27:09 2006 +0000
+++ b/mplayer.c	Sat Jul 15 16:03:12 2006 +0000
@@ -519,7 +519,7 @@
   current_module=NULL;
 }
 
-static void exit_player_with_rc(char* how, int rc){
+static void exit_player_with_rc(const char* how, int rc){
 
   uninit_player(INITED_ALL);
 #ifdef HAVE_X11
@@ -554,7 +554,7 @@
   exit(rc);
 }
 
-void exit_player(char* how){
+void exit_player(const char* how){
   exit_player_with_rc(how, 1);
 }
 
@@ -2258,7 +2258,7 @@
     return m_option_list_find(mp_properties,name);
 }
 
-int mp_property_do(char* name,int action, void* val) {
+int mp_property_do(const char* name,int action, void* val) {
     m_option_t* p = mp_property_find(name);
     if(!p) return M_PROPERTY_UNAVAILABLE;
     return m_property_do(p,action,val);
diff -r 4611423138fc -r 2ec2301183cd mplayer.h
--- a/mplayer.h	Sat Jul 15 15:27:09 2006 +0000
+++ b/mplayer.h	Sat Jul 15 16:03:12 2006 +0000
@@ -58,7 +58,7 @@
 extern int dvdsub_id;
 extern int vobsub_id;
 
-extern void exit_player(char* how);
+extern void exit_player(const char* how);
 extern void update_set_of_subtitles(void);
 
 #endif
diff -r 4611423138fc -r 2ec2301183cd subopt-helper.c
--- a/subopt-helper.c	Sat Jul 15 15:27:09 2006 +0000
+++ b/subopt-helper.c	Sat Jul 15 16:03:12 2006 +0000
@@ -324,7 +324,7 @@
 /*** little helpers */
 
 /** \brief compare the stings just as strcmp does */
-int strargcmp(strarg_t *arg, char *str) {
+int strargcmp(strarg_t *arg, const char *str) {
   int res = strncmp(arg->str, str, arg->len);
   if (!res && arg->len != strlen(str))
     res = arg->len - strlen(str);
diff -r 4611423138fc -r 2ec2301183cd subopt-helper.h
--- a/subopt-helper.h	Sat Jul 15 15:27:09 2006 +0000
+++ b/subopt-helper.h	Sat Jul 15 16:03:12 2006 +0000
@@ -44,7 +44,7 @@
 int int_non_neg( int * i );
 int int_pos( int * i );
 
-int strargcmp(strarg_t *arg, char *str);
+int strargcmp(strarg_t *arg, const char *str);
 int strargcasecmp(strarg_t *arg, char *str);
 
 #endif