From 05119ecaf6e8628377f324da97ff6af58f3e380f Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 7 Mar 2009 08:51:40 +0000 Subject: [PATCH] Make data related to suboption parsing const in libvo git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28863 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_aa.c | 8 ++++---- libvo/vo_directfb2.c | 2 +- libvo/vo_gif89a.c | 2 +- libvo/vo_gl.c | 2 +- libvo/vo_gl2.c | 2 +- libvo/vo_ivtv.c | 2 +- libvo/vo_jpeg.c | 2 +- libvo/vo_md5sum.c | 2 +- libvo/vo_png.c | 2 +- libvo/vo_pnm.c | 2 +- libvo/vo_sdl.c | 2 +- libvo/vo_v4l2.c | 2 +- libvo/vo_vdpau.c | 2 +- libvo/vo_xv.c | 2 +- libvo/vo_xvmc.c | 2 +- libvo/vo_yuv4mpeg.c | 2 +- libvo/vo_zr2.c | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c index 5046a8b9ec..d4b596b40a 100644 --- a/libvo/vo_aa.c +++ b/libvo/vo_aa.c @@ -578,19 +578,19 @@ static int parse_suboptions(const char *arg) { char *pseudoargv[4], *osdcolor = NULL, *subcolor = NULL, **strings, *helpmsg = NULL; int pseudoargc, displayhelp = 0, *booleans; - opt_t extra_opts[] = { + const opt_t extra_opts[] = { {"osdcolor", OPT_ARG_MSTRZ, &osdcolor, NULL, 0}, {"subcolor", OPT_ARG_MSTRZ, &subcolor, NULL, 0}, {"help", OPT_ARG_BOOL, &displayhelp, NULL, 0} }; opt_t *subopts = NULL, *p; - char *strings_list[] = {"-driver", "-kbddriver", "-mousedriver", "-font", + char * const strings_list[] = {"-driver", "-kbddriver", "-mousedriver", "-font", "-width", "-height", "-minwidth", "-minheight", "-maxwidth", "-maxheight", "-recwidth", "-recheight", "-bright", "-contrast", "-gamma", "-dimmul", "-boldmul", "-random" }; - char *booleans_list[] = {"-dim", "-bold", "-reverse", "-normal", + char * const booleans_list[] = {"-dim", "-bold", "-reverse", "-normal", "-boldfont", "-inverse", "-extended", "-eight", "-dither", "-floyd_steinberg", "-error_distribution"}; - char *nobooleans_list[] = {"-nodim", "-nobold", "-noreverse", "-nonormal", + char * const nobooleans_list[] = {"-nodim", "-nobold", "-noreverse", "-nonormal", "-noboldfont", "-noinverse", "-noextended", "-noeight", "-nodither", "-nofloyd_steinberg", "-noerror_distribution"}; const int nstrings = sizeof(strings_list) / sizeof(char*); diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index 133f46a07e..7aafe091e9 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -175,7 +175,7 @@ static int preinit(const char *arg) strarg_t mode_str = {0, NULL}; strarg_t par_str = {0, NULL}; strarg_t dfb_params = {0, NULL}; - opt_t subopts[] = { + const opt_t subopts[] = { {"input", OPT_ARG_BOOL, &use_input, NULL}, {"buffermode", OPT_ARG_STR, &mode_str, check_mode}, {"fieldparity", OPT_ARG_STR, &par_str, check_parity}, diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c index b7a9894591..3ad230a20b 100644 --- a/libvo/vo_gif89a.c +++ b/libvo/vo_gif89a.c @@ -104,7 +104,7 @@ static char *gif_filename = NULL; // the default output filename #define DEFAULT_FILE "out.gif" -static opt_t subopts[] = { +static const opt_t subopts[] = { {"output", OPT_ARG_MSTRZ, &gif_filename, NULL, 0}, {"fps", OPT_ARG_FLOAT, &target_fps, NULL, 0}, {NULL, 0, NULL, NULL, 0} diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index b39a3c077d..e1db6622bf 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -973,7 +973,7 @@ uninit(void) vo_uninit(); } -static opt_t subopts[] = { +static const opt_t subopts[] = { {"manyfmts", OPT_ARG_BOOL, &many_fmts, NULL}, {"osd", OPT_ARG_BOOL, &use_osd, NULL}, {"scaled-osd", OPT_ARG_BOOL, &scaled_osd, NULL}, diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index 28afc77829..9509001165 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -844,7 +844,7 @@ uninit(void) vo_uninit(); } -static opt_t subopts[] = { +static const opt_t subopts[] = { {"yuv", OPT_ARG_INT, &use_yuv, (opt_test_f)int_non_neg}, {"glfinish", OPT_ARG_BOOL, &use_glFinish, NULL}, {NULL} diff --git a/libvo/vo_ivtv.c b/libvo/vo_ivtv.c index 05f37303d5..7dd9279f38 100644 --- a/libvo/vo_ivtv.c +++ b/libvo/vo_ivtv.c @@ -59,7 +59,7 @@ static vo_mpegpes_t *pes; static int output = -1; static char *device = NULL; -static opt_t subopts[] = { +static const opt_t subopts[] = { {"output", OPT_ARG_INT, &output, (opt_test_f)int_non_neg}, {"device", OPT_ARG_MSTRZ, &device, NULL}, {NULL} diff --git a/libvo/vo_jpeg.c b/libvo/vo_jpeg.c index e1a397eaf1..bcd86c6eec 100644 --- a/libvo/vo_jpeg.c +++ b/libvo/vo_jpeg.c @@ -339,7 +339,7 @@ static int int_zero_hundred(int *val) static int preinit(const char *arg) { - opt_t subopts[] = { + const opt_t subopts[] = { {"progressive", OPT_ARG_BOOL, &jpeg_progressive_mode, NULL, 0}, {"baseline", OPT_ARG_BOOL, &jpeg_baseline, NULL, 0}, {"optimize", OPT_ARG_INT, &jpeg_optimize, diff --git a/libvo/vo_md5sum.c b/libvo/vo_md5sum.c index 4fd9cdd618..08dc49d548 100644 --- a/libvo/vo_md5sum.c +++ b/libvo/vo_md5sum.c @@ -107,7 +107,7 @@ static void md5sum_write_error(void) { static int preinit(const char *arg) { - opt_t subopts[] = { + const opt_t subopts[] = { {"outfile", OPT_ARG_MSTRZ, &md5sum_outfile, NULL, 0}, {NULL, 0, NULL, NULL, 0} }; diff --git a/libvo/vo_png.c b/libvo/vo_png.c index 5a2edf7ed9..b2e75897ea 100644 --- a/libvo/vo_png.c +++ b/libvo/vo_png.c @@ -290,7 +290,7 @@ static int int_zero_to_nine(int *sh) return 1; } -static opt_t subopts[] = { +static const opt_t subopts[] = { {"alpha", OPT_ARG_BOOL, &use_alpha, NULL, 0}, {"z", OPT_ARG_INT, &z_compression, (opt_test_f)int_zero_to_nine}, {"outdir", OPT_ARG_MSTRZ, &png_outdir, NULL, 0}, diff --git a/libvo/vo_pnm.c b/libvo/vo_pnm.c index ba88db29e9..6525a2141d 100644 --- a/libvo/vo_pnm.c +++ b/libvo/vo_pnm.c @@ -120,7 +120,7 @@ static int preinit(const char *arg) { int ppm_type = 0, pgm_type = 0, pgmyuv_type = 0, raw_mode = 0, ascii_mode = 0; - opt_t subopts[] = { + const opt_t subopts[] = { {"ppm", OPT_ARG_BOOL, &ppm_type, NULL, 0}, {"pgm", OPT_ARG_BOOL, &pgm_type, NULL, 0}, {"pgmyuv", OPT_ARG_BOOL, &pgmyuv_type, NULL, 0}, diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index 26b17776fd..8ec6d4fbc3 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -1526,7 +1526,7 @@ static int preinit(const char *arg) char * sdl_driver = NULL; int sdl_hwaccel; int sdl_forcexv; - opt_t subopts[] = { + const opt_t subopts[] = { {"forcexv", OPT_ARG_BOOL, &sdl_forcexv, NULL, 0}, {"hwaccel", OPT_ARG_BOOL, &sdl_hwaccel, NULL, 0}, {"driver", OPT_ARG_MSTRZ, &sdl_driver, NULL, 0}, diff --git a/libvo/vo_v4l2.c b/libvo/vo_v4l2.c index 7cecfd75da..1f611d864a 100644 --- a/libvo/vo_v4l2.c +++ b/libvo/vo_v4l2.c @@ -53,7 +53,7 @@ static vo_mpegpes_t *pes; static int output = -1; static char *device = NULL; -static opt_t subopts[] = { +static const opt_t subopts[] = { {"output", OPT_ARG_INT, &output, (opt_test_f)int_non_neg}, {"device", OPT_ARG_MSTRZ, &device, NULL}, {NULL} diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c index 28ae555e71..4e0194493e 100644 --- a/libvo/vo_vdpau.c +++ b/libvo/vo_vdpau.c @@ -949,7 +949,7 @@ static void uninit(void) dlclose(vdpau_lib_handle); } -static opt_t subopts[] = { +static const opt_t subopts[] = { {"deint", OPT_ARG_INT, &deint, (opt_test_f)int_non_neg}, {"pullup", OPT_ARG_BOOL, &pullup, NULL}, {"denoise", OPT_ARG_FLOAT, &denoise, NULL}, diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 47174d41a0..7ae0d48ac1 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -611,7 +611,7 @@ static int preinit(const char *arg) strarg_t ck_method_arg = { 0, NULL }; int xv_adaptor = -1; - opt_t subopts[] = + const opt_t subopts[] = { /* name arg type arg var test */ { "port", OPT_ARG_INT, &xv_port, (opt_test_f)int_pos }, diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index 1492bcedcf..5d14cf83e5 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -379,7 +379,7 @@ static int preinit(const char *arg){ int mc_ver,mc_rev; strarg_t ck_src_arg = { 0, NULL }; strarg_t ck_method_arg = { 0, NULL }; - opt_t subopts [] = + const opt_t subopts [] = { /* name arg type arg var test */ { "port", OPT_ARG_INT, &xv_port_request, (opt_test_f)int_pos }, diff --git a/libvo/vo_yuv4mpeg.c b/libvo/vo_yuv4mpeg.c index 3b7c06c782..a7790fcc52 100644 --- a/libvo/vo_yuv4mpeg.c +++ b/libvo/vo_yuv4mpeg.c @@ -513,7 +513,7 @@ static void check_events(void) static int preinit(const char *arg) { int il, il_bf; - opt_t subopts[] = { + const opt_t subopts[] = { {"interlaced", OPT_ARG_BOOL, &il, NULL}, {"interlaced_bf", OPT_ARG_BOOL, &il_bf, NULL}, {"file", OPT_ARG_MSTRZ, &yuv_filename, NULL}, diff --git a/libvo/vo_zr2.c b/libvo/vo_zr2.c index fb1fa025e6..34a92c4172 100644 --- a/libvo/vo_zr2.c +++ b/libvo/vo_zr2.c @@ -209,7 +209,7 @@ static int preinit(const char *arg) { const char *dev = NULL; char *dev_arg = NULL, *norm_arg = NULL; int norm = VIDEO_MODE_AUTO, prebuf = 0; - opt_t subopts[] = { /* don't want warnings with -Wall... */ + const opt_t subopts[] = { /* don't want warnings with -Wall... */ { "dev", OPT_ARG_MSTRZ, &dev_arg, NULL, 0 }, { "prebuf", OPT_ARG_BOOL, &prebuf, (opt_test_f)pbc, 0 }, { "norm", OPT_ARG_MSTRZ, &norm_arg, (opt_test_f)nc, 0 }, -- 2.11.4.GIT