From: Andre Noll Date: Mon, 6 Aug 2007 20:38:38 +0000 (+0200) Subject: Don't use depricated xxx_cmdline_parser_configfile(). X-Git-Tag: v0.2.17~37 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=8dffec19598a4a0ed77fa082abaf52c8fe66d889;ds=sidebyside Don't use depricated xxx_cmdline_parser_configfile(). Switch to the equivalent xxx_cmdline_parser_config_file() which takes a pointer to the parser params. --- diff --git a/audioc.c b/audioc.c index e20e887e..31b98b5c 100644 --- a/audioc.c +++ b/audioc.c @@ -75,7 +75,13 @@ int main(int argc, char *argv[]) HANDLE_VERSION_FLAG("audioc", conf); cf = configfile_exists(); if (cf) { - if (audioc_cmdline_parser_configfile(cf, &conf, 0, 0, 0)) { + struct audioc_cmdline_parser_params params = { + .override = 0, + .initialize = 0, + .check_required = 0, + .check_ambiguity = 0 + }; + if (audioc_cmdline_parser_config_file(cf, &conf, ¶ms)) { fprintf(stderr, "parse error in config file\n"); exit(EXIT_FAILURE); } diff --git a/audiod.c b/audiod.c index 35c835ec..c7b17b6f 100644 --- a/audiod.c +++ b/audiod.c @@ -1132,7 +1132,14 @@ int main(int argc, char *argv[]) para_drop_privileges(conf.user_arg, conf.group_arg); cf = configfile_exists(); if (cf) { - if (audiod_cmdline_parser_configfile(cf, &conf, 0, 0, 0)) { + struct audiod_cmdline_parser_params params = { + .override = 0, + .initialize = 0, + .check_required = 0, + .check_ambiguity = 0 + + }; + if (audiod_cmdline_parser_config_file(cf, &conf, ¶ms)) { PARA_EMERG_LOG("%s", "parse error in config file\n"); exit(EXIT_FAILURE); } diff --git a/client_common.c b/client_common.c index 88cbf51e..1b53f705 100644 --- a/client_common.c +++ b/client_common.c @@ -153,9 +153,16 @@ int client_open(int argc, char *argv[], struct private_client_data **pcd_ptr) ret = -E_NO_CONFIG; goto out; } - if (!ret) - client_cmdline_parser_configfile(pcd->config_file, - &pcd->conf, 0, 0, 0); + if (!ret) { + struct client_cmdline_parser_params params = { + .override = 0, + .initialize = 0, + .check_required = 0, + .check_ambiguity = 0 + }; + client_cmdline_parser_config_file(pcd->config_file, + &pcd->conf, ¶ms); + } ret = 1; PARA_INFO_LOG("loglevel: %d\n", pcd->conf.loglevel_arg); PARA_INFO_LOG("config_file: %s\n", pcd->config_file); diff --git a/fade.c b/fade.c index a3805187..d9834a2b 100644 --- a/fade.c +++ b/fade.c @@ -276,9 +276,16 @@ int main(int argc, char *argv[]) conf.config_file_arg); exit(EXIT_FAILURE); } - if (ret) - fade_cmdline_parser_configfile(conf.config_file_arg, - &conf, 0, 0, 0); + if (ret) { + struct fade_cmdline_parser_params params = { + .override = 0, + .initialize = 0, + .check_required = 0, + .check_ambiguity = 0 + }; + fade_cmdline_parser_config_file(conf.config_file_arg, + &conf, ¶ms); + } ret = open_mixer(); if (ret < 0) { PARA_EMERG_LOG("can not open mixer device %s.", diff --git a/filter.c b/filter.c index 1ca41648..842e030f 100644 --- a/filter.c +++ b/filter.c @@ -109,7 +109,13 @@ static int parse_config(int argc, char *argv[]) free(home); } if (!stat(cf, &statbuf)) { - if (filter_cmdline_parser_configfile(cf, &conf, 0, 0, 0)) + struct filter_cmdline_parser_params params = { + .override = 0, + .initialize = 0, + .check_required = 0, + .check_ambiguity = 0 + }; + if (filter_cmdline_parser_config_file(cf, &conf, ¶ms)) return -E_FILTER_SYNTAX; } if (!conf.list_filters_given) diff --git a/gui.c b/gui.c index 8c0da59e..a2d3e6cd 100644 --- a/gui.c +++ b/gui.c @@ -1149,6 +1149,12 @@ static void com_ll_incr(void) static void com_reread_conf(void) { char *cf =configfile_exists(); + struct gui_cmdline_parser_params params = { + .override = 1, + .initialize = 1, + .check_required = 0, + .check_ambiguity = 0 + }; if (!cf) { PARA_WARNING_LOG("%s", "there is no configuration to read"); @@ -1156,7 +1162,7 @@ static void com_reread_conf(void) } PARA_INFO_LOG("%s", "rereading command line options and config file"); gui_cmdline_parser(_argc, _argv, &conf); - gui_cmdline_parser_configfile(cf, &conf, 1, 1, 0); + gui_cmdline_parser_config_file(cf, &conf, ¶ms); PARA_NOTICE_LOG("%s", "config file reloaded"); if (check_key_map_args() < 0) finish(EXIT_FAILURE); @@ -1331,8 +1337,15 @@ int main(int argc, char *argv[]) conf.config_file_arg); exit(EXIT_FAILURE); } - if (cf) - gui_cmdline_parser_configfile(cf, &conf, 0, 0, 0); + if (cf) { + struct gui_cmdline_parser_params params = { + .override = 0, + .initialize = 0, + .check_required = 0, + .check_ambiguity = 0 + }; + gui_cmdline_parser_config_file(cf, &conf, ¶ms); + } if (check_key_map_args() < 0) { fprintf(stderr, "invalid key map in config file\n"); exit(EXIT_FAILURE); diff --git a/sdl_gui.c b/sdl_gui.c index 08c79432..6aa78546 100644 --- a/sdl_gui.c +++ b/sdl_gui.c @@ -740,9 +740,16 @@ int main(int argc, char *argv[]) args_info.config_file_arg); exit(EXIT_FAILURE); } - if (ret) - sdl_gui_cmdline_parser_configfile(args_info.config_file_arg, - &args_info, 0, 0, 0); + if (ret) { + struct sdl_gui_cmdline_parser_params params = { + .override = 0, + .initialize = 0, + .check_required = 0, + .check_ambiguity = 0 + }; + sdl_gui_cmdline_parser_config_file(args_info.config_file_arg, + &args_info, ¶ms); + } signal(SIGCHLD, SIG_IGN); width = args_info.width_arg; height = args_info.height_arg; diff --git a/server.c b/server.c index dada53e5..b4397c8f 100644 --- a/server.c +++ b/server.c @@ -232,7 +232,13 @@ static void parse_config(int override) } if (!ret) { int tmp = conf.daemon_given; - server_cmdline_parser_configfile(cf, &conf, override, 0, 0); + struct server_cmdline_parser_params params = { + .override = override, + .initialize = 0, + .check_required = 0, + .check_ambiguity = 0 + }; + server_cmdline_parser_config_file(cf, &conf, ¶ms); conf.daemon_given = tmp; } /* logfile */