diff options
author | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-16 01:40:24 +0000 |
---|---|---|
committer | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-16 01:40:24 +0000 |
commit | 15e8c12de234ddd93366def38b807567928fbb40 (patch) | |
tree | 6736b2a829cd66460dcc765391e3296ab646196a /Gui | |
parent | ca57bf90332aa59bba3385fa13cff139b7a20295 (diff) | |
download | mpv-15e8c12de234ddd93366def38b807567928fbb40.tar.bz2 mpv-15e8c12de234ddd93366def38b807567928fbb40.tar.xz |
marks several strings inside structs as const when they hold just
read-only information and modifies GetLanguage in Gui/mplayer/gtk/menu.c
to cope which the changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19115 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r-- | Gui/app.h | 2 | ||||
-rw-r--r-- | Gui/mplayer/gtk/menu.c | 4 | ||||
-rw-r--r-- | Gui/skin/skin.c | 2 | ||||
-rw-r--r-- | Gui/wm/wskeys.h | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -94,7 +94,7 @@ typedef struct { int msg; - char * name; + const char * name; } evName; extern int evBoxs; diff --git a/Gui/mplayer/gtk/menu.c b/Gui/mplayer/gtk/menu.c index 401f95ea7c..35d2883eda 100644 --- a/Gui/mplayer/gtk/menu.c +++ b/Gui/mplayer/gtk/menu.c @@ -182,7 +182,7 @@ GtkWidget * AddSeparator( GtkWidget * Menu ) typedef struct { int id; - char * name; + const char * name; } Languages_t; #define lng( a,b ) ( (int)(a) * 256 + b ) @@ -369,7 +369,7 @@ static char * ChannelNumbers[] = { "","Stereo","","","","5.1" }; #endif -char * GetLanguage( int language ) +const char * GetLanguage( int language ) { unsigned int i; for ( i=0;i<sizeof( Languages ) / sizeof( Languages_t );i++ ) diff --git a/Gui/skin/skin.c b/Gui/skin/skin.c index 123af0944c..852d3bdab6 100644 --- a/Gui/skin/skin.c +++ b/Gui/skin/skin.c @@ -586,7 +586,7 @@ int cmd_decoration( char * in ) typedef struct { - char * name; + const char * name; int (*func)( char * in ); } _item; diff --git a/Gui/wm/wskeys.h b/Gui/wm/wskeys.h index b1438af92f..830aecbc39 100644 --- a/Gui/wm/wskeys.h +++ b/Gui/wm/wskeys.h @@ -156,7 +156,7 @@ typedef struct { int code; - char * name; + const char * name; } TwsKeyNames; extern TwsKeyNames wsKeyNames[ wsKeyNumber ]; |