[MPlayer-dev-eng] [patch] more const - part5
Stefan Huehner
stefan at huehner.org
Sat Jul 15 12:26:55 CEST 2006
Hi,
attached patch marks several read-only string parameters which aren't
modified inside the called function as const.
Regards,
Stefan
-------------- next part --------------
Index: Gui/win32/interface.c
===================================================================
--- Gui/win32/interface.c (revision 19100)
+++ Gui/win32/interface.c (working copy)
@@ -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;
Index: Gui/skin/font.c
===================================================================
--- Gui/skin/font.c (revision 19100)
+++ Gui/skin/font.c (working copy)
@@ -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];
Index: Gui/skin/font.h
===================================================================
--- Gui/skin/font.h (revision 19100)
+++ Gui/skin/font.h (working copy)
@@ -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
Index: Gui/mplayer/mw.c
===================================================================
--- Gui/mplayer/mw.c (revision 19100)
+++ Gui/mplayer/mw.c (working copy)
@@ -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;
Index: libmpcodecs/ve_x264.c
===================================================================
--- libmpcodecs/ve_x264.c (revision 19100)
+++ libmpcodecs/ve_x264.c (working copy)
@@ -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++) {
Index: libmpcodecs/ad_libvorbis.c
===================================================================
--- libmpcodecs/ad_libvorbis.c (revision 19100)
+++ libmpcodecs/ad_libvorbis.c (working copy)
@@ -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;
Index: asxparser.c
===================================================================
--- asxparser.c (revision 19100)
+++ asxparser.c (working copy)
@@ -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;
Index: asxparser.h
===================================================================
--- asxparser.h (revision 19100)
+++ asxparser.h (working copy)
@@ -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);
Index: subopt-helper.c
===================================================================
--- subopt-helper.c (revision 19100)
+++ subopt-helper.c (working copy)
@@ -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);
Index: subopt-helper.h
===================================================================
--- subopt-helper.h (revision 19100)
+++ subopt-helper.h (working copy)
@@ -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
Index: m_property.h
===================================================================
--- m_property.h (revision 19100)
+++ m_property.h (working copy)
@@ -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
Index: mplayer.c
===================================================================
--- mplayer.c (revision 19100)
+++ mplayer.c (working copy)
@@ -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);
Index: mplayer.h
===================================================================
--- mplayer.h (revision 19100)
+++ mplayer.h (working copy)
@@ -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
Index: libass/ass_render.c
===================================================================
--- libass/ass_render.c (revision 19100)
+++ libass/ass_render.c (working copy)
@@ -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;
Index: m_struct.c
===================================================================
--- m_struct.c (revision 19100)
+++ m_struct.c (working copy)
@@ -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
Index: m_struct.h
===================================================================
--- m_struct.h (revision 19100)
+++ m_struct.h (working copy)
@@ -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);
///@}
Index: libmpdemux/demux_ty_osd.c
===================================================================
--- libmpdemux/demux_ty_osd.c (revision 19100)
+++ libmpdemux/demux_ty_osd.c (working copy)
@@ -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;
More information about the MPlayer-dev-eng
mailing list