From 63ba5c5f0504600844f9a9e50b9d7da3b10953f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Wed, 19 Dec 2007 19:29:34 +0100 Subject: Mark more arrays as constant. --- src/input/input_dvb.c | 2 +- src/input/input_v4l.c | 2 +- src/libmpeg2/stats.c | 10 +++++----- src/libspucc/cc_decoder.h | 2 +- src/post/deinterlace/xine_plugin.c | 4 ++-- src/post/planar/noise.c | 4 ++-- src/xine-engine/osd.h | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index 1e876f251..e6daf423b 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -1598,7 +1598,7 @@ static void load_epg_data(dvb_input_plugin_t *this) case 0x54: { /* Content Descriptor, riveting stuff */ int content_bits = getbits(eit, 8, 4); - static const char *content[] = { + static const char *const content[] = { "UNKNOWN","MOVIE","NEWS","ENTERTAINMENT","SPORT", "CHILDRENS","MUSIC","ARTS/CULTURE","CURRENT AFFAIRS", "EDUCATIONAL","INFOTAINMENT","SPECIAL","COMEDY","DRAMA", diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 34ebcdc27..7af8788ff 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -110,7 +110,7 @@ static const resolution_t resolutions[] = { { 160, 120 } }; -static const char *tv_standard_names[] = { "PAL", "NTSC", "SECAM", NULL }; +static const char *const tv_standard_names[] = { "PAL", "NTSC", "SECAM", NULL }; static const int tv_standard_values[] = { VIDEO_MODE_PAL, VIDEO_MODE_NTSC, VIDEO_MODE_SECAM }; #define NUM_RESOLUTIONS (sizeof(resolutions)/sizeof(resolutions[0])) diff --git a/src/libmpeg2/stats.c b/src/libmpeg2/stats.c index d594e718d..63c701179 100644 --- a/src/libmpeg2/stats.c +++ b/src/libmpeg2/stats.c @@ -51,7 +51,7 @@ static int debug_is_on (void) static void stats_picture (uint8_t * buffer) { - static const char * picture_coding_type_str [8] = { + static const char *const picture_coding_type_str [8] = { "Invalid picture type", "I-type", "P-type", @@ -81,7 +81,7 @@ static void stats_user_data (uint8_t * buffer) static void stats_sequence (uint8_t * buffer) { - static const char * aspect_ratio_information_str[8] = { + static const char *const aspect_ratio_information_str[8] = { "Invalid Aspect Ratio", "1:1", "4:3", @@ -91,7 +91,7 @@ static void stats_sequence (uint8_t * buffer) "Invalid Aspect Ratio", "Invalid Aspect Ratio" }; - static const char * frame_rate_str[16] = { + static const char *const frame_rate_str[16] = { "Invalid frame_rate_code", "23.976", "24", "25" , "29.97", "30" , "50", "59.94", "60" , @@ -159,7 +159,7 @@ static void stats_slice (int code, uint8_t * buffer) static void stats_sequence_extension (uint8_t * buffer) { - static const char * chroma_format_str[4] = { + static const char *const chroma_format_str[4] = { "Invalid Chroma Format", "4:2:0 Chroma", "4:2:2 Chroma", @@ -204,7 +204,7 @@ static void stats_picture_display_extension (uint8_t * buffer) static void stats_picture_coding_extension (uint8_t * buffer) { - static const char * picture_structure_str[4] = { + static const char *const picture_structure_str[4] = { "Invalid Picture Structure", "Top field", "Bottom field", diff --git a/src/libspucc/cc_decoder.h b/src/libspucc/cc_decoder.h index 8698189a6..3924bb8be 100644 --- a/src/libspucc/cc_decoder.h +++ b/src/libspucc/cc_decoder.h @@ -31,7 +31,7 @@ typedef struct cc_decoder_s cc_decoder_t; typedef struct cc_renderer_s cc_renderer_t; #define NUM_CC_PALETTES 2 -static const char *cc_schemes[NUM_CC_PALETTES + 1] = { +static const char *const cc_schemes[NUM_CC_PALETTES + 1] = { "White/Gray/Translucent", "White/Black/Solid", NULL diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c index 68eabba67..6ae2bd96d 100644 --- a/src/post/deinterlace/xine_plugin.c +++ b/src/post/deinterlace/xine_plugin.c @@ -56,8 +56,8 @@ typedef struct post_plugin_deinterlace_s post_plugin_deinterlace_t; #define MAX_NUM_METHODS 30 static const char *enum_methods[MAX_NUM_METHODS]; -static const char *enum_pulldown[] = { "none", "vektor", NULL }; -static const char *enum_framerate[] = { "full", "half_top", "half_bottom", NULL }; +static const char *const enum_pulldown[] = { "none", "vektor", NULL }; +static const char *const enum_framerate[] = { "full", "half_top", "half_bottom", NULL }; static void *help_string; diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c index 57b8618ab..4ca3d62dc 100644 --- a/src/post/planar/noise.c +++ b/src/post/planar/noise.c @@ -318,8 +318,8 @@ typedef struct noise_parameters_s { type, quality, pattern; } noise_parameters_t; -static const char *enum_types[] = {"uniform", "gaussian", NULL}; -static const char *enum_quality[] = {"fixed", "temporal", "averaged temporal", NULL}; +static const char *const enum_types[] = {"uniform", "gaussian", NULL}; +static const char *const enum_quality[] = {"fixed", "temporal", "averaged temporal", NULL}; /* * description of params struct diff --git a/src/xine-engine/osd.h b/src/xine-engine/osd.h index 7b04c0a17..ce7c13e5f 100644 --- a/src/xine-engine/osd.h +++ b/src/xine-engine/osd.h @@ -265,7 +265,7 @@ osd_renderer_t *_x_osd_renderer_init( xine_stream_t *stream ); #ifdef __OSD_C__ /* This text descriptions are used for config screen */ -static const char *textpalettes_str[NUMBER_OF_TEXT_PALETTES+1] = { +static const char *const textpalettes_str[NUMBER_OF_TEXT_PALETTES+1] = { "white-black-transparent", "white-none-transparent", "white-none-translucid", -- cgit v1.2.3