A lot of missing const in options lists

modules/access/bda/bda.c

@@ -59,7 +59,7 @@ static int Control( access_t *, int, va_list );
 #define INVERSION_TEXT N_("Inversion mode")
 #define INVERSION_LONGTEXT N_("Inversion mode [0=off, 1=on, 2=auto]")
 static const int i_inversion_list[] = { -1, 0, 1, 2 };
-static const char *ppsz_inversion_text[] = { N_("Undefined"), N_("Off"),
+static const char *const ppsz_inversion_text[] = { N_("Undefined"), N_("Off"),
     N_("On"), N_("Auto") };
 
 #define PROBE_TEXT N_("Probe DVB card for capabilities")
@@ -111,47 +111,47 @@ static const char *ppsz_inversion_text[] = { N_("Undefined"), N_("Off"),
 #define MODULATION_LONGTEXT N_("QAM constellation points " \
     "[16, 32, 64, 128, 256]")
 static const int i_qam_list[] = { -1, 16, 32, 64, 128, 256 };
-static const char *ppsz_qam_text[] = { N_("Undefined"), N_("16"), N_("32"),
-    N_("64"), N_("128"), N_("256") };
+static const char *const ppsz_qam_text[] = {
+    N_("Undefined"), N_("16"), N_("32"), N_("64"), N_("128"), N_("256") };
 
 /* Terrestrial */
 #define CODE_RATE_HP_TEXT N_("Terrestrial high priority stream code rate (FEC)")
 #define CODE_RATE_HP_LONGTEXT N_("High Priority FEC Rate " \
     "[Undefined,1/2,2/3,3/4,5/6,7/8]")
 static const int i_hp_fec_list[] = { -1, 1, 2, 3, 4, 5 };
-static const char *ppsz_hp_fec_text[] = { N_("Undefined"), N_("1/2"), N_("2/3"),
-    N_("3/4"), N_("5/6"), N_("7/8") };
+static const char *const ppsz_hp_fec_text[] = {
+    N_("Undefined"), N_("1/2"), N_("2/3"), N_("3/4"), N_("5/6"), N_("7/8") };
 
 #define CODE_RATE_LP_TEXT N_("Terrestrial low priority stream code rate (FEC)")
 #define CODE_RATE_LP_LONGTEXT N_("Low Priority FEC Rate " \
     "[Undefined,1/2,2/3,3/4,5/6,7/8]")
 static const int i_lp_fec_list[] = { -1, 1, 2, 3, 4, 5 };
-static const char *ppsz_lp_fec_text[] = { N_("Undefined"), N_("1/2"), N_("2/3"),
-    N_("3/4"), N_("5/6"), N_("7/8") };
+static const char *const ppsz_lp_fec_text[] = {
+    N_("Undefined"), N_("1/2"), N_("2/3"), N_("3/4"), N_("5/6"), N_("7/8") };
 
 #define BANDWIDTH_TEXT N_("Terrestrial bandwidth")
 #define BANDWIDTH_LONGTEXT N_("Terrestrial bandwidth [0=auto,6,7,8 in MHz]")
 static const int i_band_list[] = { -1, 6, 7, 8 };
-static const char *ppsz_band_text[] = { N_("Undefined"), N_("6 MHz"),
-    N_("7 MHz"), N_("8 MHz") };
+static const char *const ppsz_band_text[] = {
+    N_("Undefined"), N_("6 MHz"), N_("7 MHz"), N_("8 MHz") };
 
 #define GUARD_TEXT N_("Terrestrial guard interval")
 #define GUARD_LONGTEXT N_("Guard interval [Undefined,1/4,1/8,1/16,1/32]")
 static const int i_guard_list[] = { -1, 4, 8, 16, 32 };
-static const char *ppsz_guard_text[] = { N_("Undefined"), N_("1/4"), N_("1/8"),
-    N_("1/16"), N_("1/32") };
+static const char *const ppsz_guard_text[] = {
+    N_("Undefined"), N_("1/4"), N_("1/8"), N_("1/16"), N_("1/32") };
 
 #define TRANSMISSION_TEXT N_("Terrestrial transmission mode")
 #define TRANSMISSION_LONGTEXT N_("Transmission mode [Undefined,2k,8k]")
 static const int i_transmission_list[] = { -1, 2, 8 };
-static const char *ppsz_transmission_text[] = { N_("Undefined"), N_("2k"),
-    N_("8k") };
+static const char *const ppsz_transmission_text[] = {
+    N_("Undefined"), N_("2k"), N_("8k") };
 
 #define HIERARCHY_TEXT N_("Terrestrial hierarchy mode")
 #define HIERARCHY_LONGTEXT N_("Hierarchy alpha value [Undefined,1,2,4]")
 static const int i_hierarchy_list[] = { -1, 1, 2, 4 };
-static const char *ppsz_hierarchy_text[] = { N_("Undefined"), N_("1"),
-    N_("2"), N_("4") };
+static const char *const ppsz_hierarchy_text[] = {
+    N_("Undefined"), N_("1"), N_("2"), N_("4") };
 
 /* BDA module additional DVB-S Parameters */
 #define AZIMUTH_TEXT N_("Satellite Azimuth")
@@ -163,8 +163,9 @@ static const char *ppsz_hierarchy_text[] = { N_("Undefined"), N_("1"),
     "Satellite Longitude in 10ths of degree, -ve=West")
 #define POLARISATION_TEXT N_("Satellite Polarisation")
 #define POLARISATION_LONGTEXT N_("Satellite Polarisation [H/V/L/R]")
-static const char *ppsz_polar_list[] = { "H", "V", "L", "R" };
-static const char *ppsz_polar_text[] = { N_("Horizontal"), N_("Vertical"),
+static const char *const ppsz_polar_list[] = { "H", "V", "L", "R" };
+static const char *const ppsz_polar_text[] = {
+    N_("Horizontal"), N_("Vertical"),
     N_("Circular Left"), N_("Circular Right") };
 
 vlc_module_begin();

modules/access/cdda/cdda.c

@@ -39,8 +39,8 @@
  *****************************************************************************/
 
 #if LIBCDIO_VERSION_NUM >= 72
-static const char *psz_paranoia_list[] = { "none", "overlap", "full" };
-static const char *psz_paranoia_list_text[] = { N_("none"), N_("overlap"),
+static const char *const psz_paranoia_list[] = { "none", "overlap", "full" };
+static const char *const psz_paranoia_list_text[] = { N_("none"), N_("overlap"),
                                           N_("full") };
 #endif
 

modules/access/directory.c

@@ -79,9 +79,9 @@ static int  DemuxOpen ( vlc_object_t * );
         "collapse: subdirectories appear but are expanded on first play.\n" \
         "expand: all subdirectories are expanded.\n" )
 
-static const char *psz_recursive_list[] = { "none", "collapse", "expand" };
-static const char *psz_recursive_list_text[] = { N_("none"), N_("collapse"),
-                                                 N_("expand") };
+static const char *const psz_recursive_list[] = { "none", "collapse", "expand" };
+static const char *const psz_recursive_list_text[] = {
+    N_("none"), N_("collapse"), N_("expand") };
 
 #define IGNORE_TEXT N_("Ignored extensions")
 #define IGNORE_LONGTEXT N_( \

modules/access/dshow/dshow.cpp

@@ -77,19 +77,19 @@ static void ConfigTuner( vlc_object_t *, ICaptureGraphBuilder2 *,
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-static const char *ppsz_vdev[] = { "", "none" };
-static const char *ppsz_vdev_text[] = { N_("Default"), N_("None") };
-static const char *ppsz_adev[] = { "", "none" };
-static const char *ppsz_adev_text[] = { N_("Default"), N_("None") };
-static int  pi_tuner_input[] = { 0, 1, 2 };
-static const char *ppsz_tuner_input_text[] =
+static const char *const ppsz_vdev[] = { "", "none" };
+static const char *const ppsz_vdev_text[] = { N_("Default"), N_("None") };
+static const char *const ppsz_adev[] = { "", "none" };
+static const char *const ppsz_adev_text[] = { N_("Default"), N_("None") };
+static const int pi_tuner_input[] = { 0, 1, 2 };
+static const char *const ppsz_tuner_input_text[] =
     {N_("Default"), N_("Cable"), N_("Antenna")};
 static const int pi_amtuner_mode[]  = { AMTUNER_MODE_DEFAULT,
                                  AMTUNER_MODE_TV,
                                  AMTUNER_MODE_FM_RADIO,
                                  AMTUNER_MODE_AM_RADIO,
                                  AMTUNER_MODE_DSS };
-static const char *ppsz_amtuner_mode_text[] = { N_("Default"),
+static const char *const ppsz_amtuner_mode_text[] = { N_("Default"),
                                           N_("TV"),
                                           N_("FM radio"),
                                           N_("AM radio"),

modules/access/dvdread.c

@@ -87,8 +87,8 @@
            "libcss.\n" \
     "The default method is: key.")
 
-static const char *psz_css_list[] = { "title", "disc", "key" };
-static const char *psz_css_list_text[] = { N_("title"), N_("Disc"), N_("Key") };
+static const char *const psz_css_list[] = { "title", "disc", "key" };
+static const char *const psz_css_list_text[] = { N_("title"), N_("Disc"), N_("Key") };
 
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );

modules/access/pvr.c

@@ -114,15 +114,15 @@ static void Close( vlc_object_t * );
 #define CHAN_LONGTEXT N_( "Channel of the card to use (Usually, 0 = tuner, " \
     "1 = composite, 2 = svideo)" )
 
-static int i_norm_list[] =
+static const int i_norm_list[] =
     { V4L2_STD_UNKNOWN, V4L2_STD_SECAM, V4L2_STD_PAL, V4L2_STD_NTSC };
-static const char *psz_norm_list_text[] =
+static const char *const psz_norm_list_text[] =
     { N_("Automatic"), N_("SECAM"), N_("PAL"),  N_("NTSC") };
 
-static int i_bitrates[] = { 0, 1 };
-static const char *psz_bitrates_list_text[] = { N_("vbr"), N_("cbr") };
+static const int i_bitrates[] = { 0, 1 };
+static const char *const psz_bitrates_list_text[] = { N_("vbr"), N_("cbr") };
 
-static int pi_radio_range[2] = { 65000, 108000 };
+static const int pi_radio_range[2] = { 65000, 108000 };
 
 vlc_module_begin();
     set_shortname( N_("PVR") );

modules/access/v4l.c

@@ -143,7 +143,7 @@ static void Close( vlc_object_t * );
 
 static int i_norm_list[] =
     { VIDEO_MODE_AUTO, VIDEO_MODE_SECAM, VIDEO_MODE_PAL, VIDEO_MODE_NTSC };
-static const char *psz_norm_list_text[] =
+static const char *const psz_norm_list_text[] =
     { N_("Automatic"), N_("SECAM"), N_("PAL"),  N_("NTSC") };
 
 vlc_module_begin();

modules/access/v4l2/v4l2.c

@@ -240,21 +240,21 @@ typedef enum {
     IO_METHOD_USERPTR,
 } io_method;
 
-static int i_standards_list[] =
+static const int i_standards_list[] =
     { V4L2_STD_UNKNOWN, V4L2_STD_SECAM, V4L2_STD_PAL, V4L2_STD_NTSC };
-static const char *psz_standards_list_text[] =
+static const char *const psz_standards_list_text[] =
     { N_("Default"), N_("SECAM"), N_("PAL"),  N_("NTSC") };
 
-static int i_iomethod_list[] =
+static const int i_iomethod_list[] =
     { IO_METHOD_READ, IO_METHOD_MMAP, IO_METHOD_USERPTR };
-static const char *psz_iomethod_list_text[] =
+static const char *const psz_iomethod_list_text[] =
     { N_("READ"), N_("MMAP"),  N_("USERPTR") };
 
-static int i_tuner_audio_modes_list[] =
+static const int i_tuner_audio_modes_list[] =
     { V4L2_TUNER_MODE_MONO, V4L2_TUNER_MODE_STEREO,
       V4L2_TUNER_MODE_LANG1, V4L2_TUNER_MODE_LANG2,
       V4L2_TUNER_MODE_SAP, V4L2_TUNER_MODE_LANG1_LANG2 };
-static const char *psz_tuner_audio_modes_list_text[] =
+static const char *const psz_tuner_audio_modes_list_text[] =
     { N_( "Mono" ),
       N_( "Stereo" ),
       N_( "Primary language (Analog TV tuners only)" ),

modules/access_output/file.c

@@ -81,7 +81,7 @@ vlc_module_end();
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
-static const char *ppsz_sout_options[] = {
+static const char *const ppsz_sout_options[] = {
     "append", NULL
 };
 

modules/access_output/http.c

@@ -123,7 +123,7 @@ vlc_module_end();
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
-static const char *ppsz_sout_options[] = {
+static const char *const ppsz_sout_options[] = {
     "user", "pwd", "mime", "cert", "key", "ca", "crl", NULL
 };
 

modules/access_output/shout.c

@@ -140,7 +140,7 @@ vlc_module_end();
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
-static const char *ppsz_sout_options[] = {
+static const char *const ppsz_sout_options[] = {
     "name", "description", "mp3", "genre", "url", "bitrate", "samplerate",
     "channels", "quality", "public", NULL
 };

modules/audio_filter/channel_mixer/mono.c

@@ -97,7 +97,7 @@ struct filter_sys_t
     "2=rear left, 3=rear right, 4=center, 5=left front)")
 
 static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5 };
-static const char *ppsz_pos_descriptions[] =
+static const char *const ppsz_pos_descriptions[] =
 { N_("Left"), N_("Right"), N_("Left rear"), N_("Right rear"), N_("Center"),
   N_("Left front") };
 

modules/audio_filter/equalizer_presets.h

@@ -31,12 +31,12 @@
 #define EQZ_BANDS_MAX 10
 
 #define NB_PRESETS 18
-static const char *preset_list[] = {
+static const char *const preset_list[] = {
     "flat", "classical", "club", "dance", "fullbass", "fullbasstreble",
     "fulltreble", "headphones","largehall", "live", "party", "pop", "reggae",
     "rock", "ska", "soft", "softrock", "techno"
 };
-static const char *preset_list_text[] = {
+static const char *const preset_list_text[] = {
     N_("Flat"), N_("Classical"), N_("Club"), N_("Dance"), N_("Full bass"),
     N_("Full bass and treble"), N_("Full treble"), N_("Headphones"),
     N_("Large Hall"), N_("Live"), N_("Party"), N_("Pop"), N_("Reggae"),

modules/audio_output/alsa.c

@@ -101,8 +101,8 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name,
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-static const char *ppsz_devices[] = { "default" };
-static const char *ppsz_devices_text[] = { N_("Default") };
+static const char *const ppsz_devices[] = { "default" };
+static const char *const ppsz_devices_text[] = { N_("Default") };
 vlc_module_begin();
     set_shortname( "ALSA" );
     set_description( N_("ALSA audio output") );

modules/audio_output/file.c

@@ -91,19 +91,19 @@ static void    Play        ( aout_instance_t * );
 #define WAV_LONGTEXT N_("Instead of writing a raw file, you can add a WAV " \
                         "header to the file.")
 
-static const char *format_list[] = { "u8", "s8", "u16", "s16", "u16_le",
+static const char *const format_list[] = { "u8", "s8", "u16", "s16", "u16_le",
                                      "s16_le", "u16_be", "s16_be", "fixed32",
                                      "float32", "spdif" };
-static int format_int[] = { VLC_FOURCC('u','8',' ',' '),
-                            VLC_FOURCC('s','8',' ',' '),
-                            AOUT_FMT_U16_NE, AOUT_FMT_S16_NE,
-                            VLC_FOURCC('u','1','6','l'),
-                            VLC_FOURCC('s','1','6','l'),
-                            VLC_FOURCC('u','1','6','b'),
-                            VLC_FOURCC('s','1','6','b'),
-                            VLC_FOURCC('f','i','3','2'),
-                            VLC_FOURCC('f','l','3','2'),
-                            VLC_FOURCC('s','p','i','f') };
+static const int format_int[] = { VLC_FOURCC('u','8',' ',' '),
+                                  VLC_FOURCC('s','8',' ',' '),
+                                  AOUT_FMT_U16_NE, AOUT_FMT_S16_NE,
+                                  VLC_FOURCC('u','1','6','l'),
+                                  VLC_FOURCC('s','1','6','l'),
+                                  VLC_FOURCC('u','1','6','b'),
+                                  VLC_FOURCC('s','1','6','b'),
+                                  VLC_FOURCC('f','i','3','2'),
+                                  VLC_FOURCC('f','l','3','2'),
+                                  VLC_FOURCC('s','p','i','f') };
 
 #define FILE_TEXT N_("Output file")
 #define FILE_LONGTEXT N_("File to which the audio samples will be written to. (\"-\" for stdout")

modules/audio_output/waveout.c

@@ -144,8 +144,8 @@ static uint32_t findDeviceID(char *);
 
 static const char psz_device_name_fmt[] = "%s ($%x,$%x)";
 
-static const char *ppsz_adev[] = { "wavemapper", };
-static const char *ppsz_adev_text[] = { N_("Microsoft Soundmapper") };
+static const char *const ppsz_adev[] = { "wavemapper", };
+static const char *const ppsz_adev_text[] = { N_("Microsoft Soundmapper") };
 
 
 

modules/codec/dirac.c

@@ -62,7 +62,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict );
 
 #define ENC_CFG_PREFIX "sout-dirac-"
 
-static const char *ppsz_enc_options[] = {
+static const char *const ppsz_enc_options[] = {
     "quality", NULL
 };
 

modules/codec/dvbsub.c

@@ -70,8 +70,8 @@
 #define ENC_POSY_TEXT N_("Encoding Y coordinate")
 #define ENC_POSY_LONGTEXT N_("Y coordinate of the encoded subtitle" )
 
-static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static const char *ppsz_pos_descriptions[] =
+static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
+static const char *const ppsz_pos_descriptions[] =
 { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
   N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
 
@@ -110,7 +110,7 @@ vlc_module_begin();
     add_obsolete_integer( ENC_CFG_PREFIX "timeout" ); /* Suppressed since 0.8.5 */
 vlc_module_end();
 
-static const char *ppsz_enc_options[] = { "x", "y", NULL };
+static const char *const ppsz_enc_options[] = { "x", "y", NULL };
 
 /****************************************************************************
  * Local structures

modules/codec/fake.c

@@ -78,7 +78,7 @@ static int FakeCallback( vlc_object_t *, char const *,
 #define CHROMA_LONGTEXT N_( \
     "Force use of a specific chroma for output. Default is I420." )
 
-static const char *ppsz_deinterlace_type[] =
+static const char *const ppsz_deinterlace_type[] =
 {
     "deinterlace", "ffmpeg-deinterlace"
 };

modules/codec/ffmpeg/encoder.c

@@ -149,7 +149,7 @@ struct encoder_sys_t
     mtime_t  pi_delay_pts[MAX_FRAME_DELAY];
 };
 
-static const char *ppsz_enc_options[] = {
+static const char *const ppsz_enc_options[] = {
     "keyint", "bframes", "vt", "qmin", "qmax", "hq", "strict-rc",
     "rc-buffer-size", "rc-buffer-aggressivity", "pre-me", "hurry-up",
     "interlace", "i-quant-factor", "noise-reduction", "mpeg4-matrix",

modules/codec/ffmpeg/ffmpeg.c

@@ -70,18 +70,19 @@ struct decoder_sys_t
 static int OpenDecoder( vlc_object_t * );
 static void CloseDecoder( vlc_object_t * );
 
-static int  nloopf_list[] = { 0, 1, 2, 3, 4 };
-static const char *nloopf_list_text[] =
+static const int  nloopf_list[] = { 0, 1, 2, 3, 4 };
+static const char *const nloopf_list_text[] =
   { N_("None"), N_("Non-ref"), N_("Bidir"), N_("Non-key"), N_("All") };
 
 #ifdef ENABLE_SOUT
-static const char *enc_hq_list[] = { "rd", "bits", "simple" };
-static const char *enc_hq_list_text[] = { N_("rd"), N_("bits"), N_("simple") };
+static const char *const enc_hq_list[] = { "rd", "bits", "simple" };
+static const char *const enc_hq_list_text[] = {
+    N_("rd"), N_("bits"), N_("simple") };
 #endif
 
 #if defined(HAVE_LIBSWSCALE_SWSCALE_H)  || defined(HAVE_FFMPEG_SWSCALE_H)
-static int pi_mode_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static const char *ppsz_mode_descriptions[] =
+static const int pi_mode_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
+static const char *const ppsz_mode_descriptions[] =
 { N_("Fast bilinear"), N_("Bilinear"), N_("Bicubic (good quality)"),
   N_("Experimental"), N_("Nearest neighbour (bad quality)"),
   N_("Area"), N_("Luma bicubic / chroma bilinear"), N_("Gauss"),

modules/codec/ffmpeg/mux.c

@@ -47,7 +47,7 @@
 /* Version checking */
 #if defined(HAVE_LIBAVFORMAT_AVFORMAT_H) || defined(HAVE_FFMPEG_AVFORMAT_H)
 
-static const char *ppsz_mux_options[] = {
+static const char *const ppsz_mux_options[] = {
     "mux", NULL
 };
 

modules/codec/subtitles/subsdec.c

@@ -49,7 +49,8 @@ static char           *CreateHtmlSubtitle ( char * );
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/
-static const char *ppsz_encodings[] = { DEFAULT_NAME, "ASCII", "UTF-8", "",
+static const char *const ppsz_encodings[] = {
+    DEFAULT_NAME, "ASCII", "UTF-8", "",
     "ISO-8859-1", "CP1252", "MacRoman", "MacIceland","ISO-8859-15", "",
     "ISO-8859-2", "CP1250", "MacCentralEurope", "MacCroatian", "MacRomania", "",
     "ISO-8859-5", "CP1251", "MacCyrillic", "MacUkraine", "KOI8-R", "KOI8-U", "KOI8-RU", "",
@@ -96,8 +97,9 @@ The following known charsets are used:
 254 = PC 437
 */
 
-static int  pi_justification[] = { 0, 1, 2 };
-static const char *ppsz_justification_text[] = {N_("Center"),N_("Left"),N_("Right")};
+static const int  pi_justification[] = { 0, 1, 2 };
+static const char *const ppsz_justification_text[] = {
+    N_("Center"),N_("Left"),N_("Right")};
 
 #define ENCODING_TEXT N_("Subtitles text encoding")
 #define ENCODING_LONGTEXT N_("Set the encoding used in text subtitles")

modules/codec/theora.c

@@ -121,7 +121,7 @@ vlc_module_begin();
                  ENC_QUALITY_LONGTEXT, false );
 vlc_module_end();
 
-static const char *ppsz_enc_options[] = {
+static const char *const ppsz_enc_options[] = {
     "quality", NULL
 };
 

modules/codec/twolame.c

@@ -66,8 +66,8 @@ static block_t *Encode   ( encoder_t *, aout_buffer_t * );
 #define ENC_PSY_LONGTEXT N_( \
   "Integer from -1 (no model) to 4." )
 
-static int pi_stereo_values[] = { 0, 1, 2 };
-static char *ppsz_stereo_descriptions[] =
+static const int pi_stereo_values[] = { 0, 1, 2 };
+static const char *const ppsz_stereo_descriptions[] =
 { N_("Stereo"), N_("Dual mono"), N_("Joint stereo") };
 
 
@@ -90,7 +90,7 @@ vlc_module_begin();
                  ENC_PSY_LONGTEXT, false );
 vlc_module_end();
 
-static const char *ppsz_enc_options[] = {
+static const char *const ppsz_enc_options[] = {
     "quality", "mode", "vbr", "psy", NULL
 };
 

modules/codec/vorbis.c

@@ -223,7 +223,7 @@ vlc_module_begin();
 vlc_module_end();
 
 #ifndef MODULE_NAME_IS_tremor
-static const char *ppsz_enc_options[] = {
+static const char *const ppsz_enc_options[] = {
     "quality", "max-bitrate", "min-bitrate", "cbr", NULL
 };
 #endif

modules/codec/x264.c

@@ -373,33 +373,33 @@ static void Close( vlc_object_t * );
 #define AUD_LONGTEXT N_( "Generate access unit delimiter NAL units.")
 
 #if X264_BUILD >= 24 && X264_BUILD < 58
-static const char *enc_me_list[] =
+static const char *const enc_me_list[] =
   { "dia", "hex", "umh", "esa" };
-static const char *enc_me_list_text[] =
+static const char *const enc_me_list_text[] =
   { N_("dia"), N_("hex"), N_("umh"), N_("esa") };
 #endif
 
 #if X264_BUILD >= 58 /* r728 */
-static const char *enc_me_list[] =
+static const char *const enc_me_list[] =
   { "dia", "hex", "umh", "esa", "tesa" };
-static const char *enc_me_list_text[] =
+static const char *const enc_me_list_text[] =
   { N_("dia"), N_("hex"), N_("umh"), N_("esa"), N_("tesa") };
 #endif
 
-static const char *enc_analyse_list[] =
+static const char *const enc_analyse_list[] =
   { "none", "fast", "normal", "slow", "all" };
-static const char *enc_analyse_list_text[] =
+static const char *const enc_analyse_list_text[] =
   { N_("none"), N_("fast"), N_("normal"), N_("slow"), N_("all") };
 
 #if X264_BUILD >= 45 /* r457 */
-static const char *direct_pred_list[] =
+static const char *const direct_pred_list[] =
   { "none", "spatial", "temporal", "auto" };
-static const char *direct_pred_list_text[] =
+static const char *const direct_pred_list_text[] =
   { N_("none"), N_("spatial"), N_("temporal"), N_("auto") };
 #else
-static const char *direct_pred_list[] =
+static const char *const direct_pred_list[] =
   { "none", "spatial", "temporal" };
-static const char *direct_pred_list_text[] =
+static const char *const direct_pred_list_text[] =
   { N_("none"), N_("spatial"), N_("temporal") };
 #endif
 
@@ -690,7 +690,7 @@ vlc_module_end();
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static const char *ppsz_sout_options[] = {
+static const char *const ppsz_sout_options[] = {
     "8x8dct", "analyse", "asm", "aud", "bframes", "bime", "bpyramid",
     "b-adapt", "b-bias", "b-rdo", "cabac", "chroma-me", "chroma-qp-offset",
     "cplxblur", "crf", "dct-decimate", "deadzone-inter", "deadzone-intra",

modules/codec/zvbi.c

@@ -96,14 +96,14 @@ static subpicture_t *Decode( decoder_t *, block_t ** );
 
 // #define ZVBI_DEBUG
 
-static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static const char *ppsz_pos_descriptions[] =
+static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
+static const char *const ppsz_pos_descriptions[] =
 { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
   N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
 
 vlc_module_begin();
     set_description( N_("VBI and Teletext decoder") );
-    set_shortname( "VBI & Teletext" );
+    set_shortname( N_("VBI & Teletext") );
     set_capability( "decoder", 51 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_SCODEC );

modules/control/gestures.c

@@ -87,8 +87,8 @@ static void RunIntf        ( intf_thread_t *p_intf );
 #define BUTTON_LONGTEXT N_( \
     "Trigger button for mouse gestures." )
 
-static const char *button_list[] = { "left", "middle", "right" };
-static const char *button_list_text[] =
+static const char *const button_list[] = { "left", "middle", "right" };
+static const char *const button_list_text[] =
                                    { N_("Left"), N_("Middle"), N_("Right") };
 
 vlc_module_begin();

modules/demux/avi/avi.c

@@ -55,9 +55,9 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-static int pi_index[] = {0,1,2};
+static const int pi_index[] = {0,1,2};
 
-static const char *ppsz_indexes[] = { N_("Ask"), N_("Always fix"),
+static const char *const ppsz_indexes[] = { N_("Ask"), N_("Always fix"),
                                 N_("Never fix") };
 
 vlc_module_begin();

modules/demux/subtitle.c

@@ -62,7 +62,7 @@ static void Close( vlc_object_t *p_this );
     "\"mpsub\", \"jacosub\", \"psb\", \"realtext\", \"dks\", \"subviewer1\", " \
     " and \"auto\" (meaning autodetection, this should always work).")
 
-static const char *ppsz_sub_type[] =
+static const char *const ppsz_sub_type[] =
 {
     "auto", "microdvd", "subrip", "subviewer", "ssa1",
     "ssa2-4", "ass", "vplayer", "sami", "dvdsubtitle", "mpl2",

modules/gui/fbosd.c

@@ -159,16 +159,18 @@ static picture_t *RenderText( intf_thread_t *, const char *,
 #define DISPLAY_LONGTEXT N_( "All rendered images and text will be " \
     "displayed on the overlay framebuffer." )
 
-static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static const char *ppsz_pos_descriptions[] =
+static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
+static const char *const ppsz_pos_descriptions[] =
 { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
   N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
 
-static int pi_color_values[] = { 0xf0000000, 0x00000000, 0x00808080, 0x00C0C0C0,
+static const int pi_color_values[] = {
+               0xf0000000, 0x00000000, 0x00808080, 0x00C0C0C0,
                0x00FFFFFF, 0x00800000, 0x00FF0000, 0x00FF00FF, 0x00FFFF00,
                0x00808000, 0x00008000, 0x00008080, 0x0000FF00, 0x00800080,
                0x00000080, 0x000000FF, 0x0000FFFF};
-static const char *ppsz_color_descriptions[] = { N_("Default"), N_("Black"),
+static const char *const ppsz_color_descriptions[] = {
+               N_("Default"), N_("Black"),
                N_("Gray"), N_("Silver"), N_("White"), N_("Maroon"), N_("Red"),
                N_("Fuchsia"), N_("Yellow"), N_("Olive"), N_("Green"),
                N_("Teal"), N_("Lime"), N_("Purple"), N_("Navy"), N_("Blue"),

modules/gui/qt4/qt4.cpp

@@ -131,14 +131,14 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 #define QT_ALWAYS_VIDEO_MODE_TEXT N_( "Complete look with information area" )
 #define QT_MINIMAL_MODE_TEXT N_( "Minimal look with no menus" )
 
-static int i_mode_list[] =
+static const int i_mode_list[] =
     { QT_NORMAL_MODE, QT_ALWAYS_VIDEO_MODE, QT_MINIMAL_MODE };
-static const char *psz_mode_list_text[] =
+static const char *const psz_mode_list_text[] =
     { QT_NORMAL_MODE_TEXT, QT_ALWAYS_VIDEO_MODE_TEXT, QT_MINIMAL_MODE_TEXT };
 
 vlc_module_begin();
-    set_shortname( (char *)"Qt" );
-    set_description( (char*)_("Qt interface") );
+    set_shortname( "Qt" );
+    set_description( N_("Qt interface") );
     set_category( CAT_INTERFACE ) ;
     set_subcategory( SUBCAT_INTERFACE_MAIN );
     set_capability( "interface", 151 );

modules/gui/wxwidgets/wxwidgets.cpp

@@ -112,17 +112,16 @@ private:
                 "less features). You can select which one will be available " \
                 "on the toolbar (or both)." )
 
-static int pi_playlist_views[] = { 0,1,2 };
-static const char *psz_playlist_views[] = { N_("Normal" ), N_("Embedded" ) ,
-                                            N_("Both") };
+static const int pi_playlist_views[] = { 0,1,2 };
+static const char *const psz_playlist_views[] = {
+    N_("Normal" ), N_("Embedded" ), N_("Both") };
 
 vlc_module_begin();
-    int i_score = 150;
-    set_shortname( (char*) "wxWidgets" );
-    set_description( (char *) _("wxWidgets interface module") );
+    set_shortname( "wxWidgets" );
+    set_description( N_("wxWidgets interface module") );
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_MAIN );
-    set_capability( "interface", i_score );
+    set_capability( "interface", 150 );
     set_callbacks( Open, Close );
     add_shortcut( "wxwindows" );
     add_shortcut( "wxwin" );
@@ -191,10 +190,7 @@ static int Open( vlc_object_t *p_this )
     /* Allocate instance and initialize some members */
     p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
     if( p_intf->p_sys == NULL )
-    {
-        msg_Err( p_intf, "out of memory" );
         return VLC_ENOMEM;
-    }
     memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) );