Mercurial > mplayer.hg
comparison cfg-common.h @ 34169:9b617726812c
Sanitize include behaviour.
The normal func_param argument type will iterate over all previous
values each time a new value is assigned.
This leads e.g. to a complete mess and non-working recursion limiting
when creating a config file that includes itself.
Seem to also fix bug #1994.
| author | reimar |
|---|---|
| date | Tue, 25 Oct 2011 20:18:35 +0000 |
| parents | 09bdaa0c82b3 |
| children | 9ba2da76a0e0 |
comparison
equal
deleted
inserted
replaced
| 34168:55abe5125482 | 34169:9b617726812c |
|---|---|
| 303 {"msgmodule", &mp_msg_module, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, | 303 {"msgmodule", &mp_msg_module, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, |
| 304 {"nomsgmodule", &mp_msg_module, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, | 304 {"nomsgmodule", &mp_msg_module, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, |
| 305 #ifdef CONFIG_ICONV | 305 #ifdef CONFIG_ICONV |
| 306 {"msgcharset", &mp_msg_charset, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, | 306 {"msgcharset", &mp_msg_charset, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, |
| 307 #endif | 307 #endif |
| 308 {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, | 308 {"include", cfg_include, CONF_TYPE_FUNC_PARAM_IMMEDIATE, CONF_NOSAVE, 0, 0, NULL}, |
| 309 #ifdef CONFIG_PRIORITY | 309 #ifdef CONFIG_PRIORITY |
| 310 {"priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 310 {"priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
| 311 #endif | 311 #endif |
| 312 {"codecpath", &codec_path, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 312 {"codecpath", &codec_path, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
| 313 {"noconfig", noconfig_opts, CONF_TYPE_SUBCONFIG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL}, | 313 {"noconfig", noconfig_opts, CONF_TYPE_SUBCONFIG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL}, |