main: move initialization of default config values closer together
Michael
This commit is contained in:
parent
9274b5556e
commit
d8da7f55f7
@ -313,17 +313,16 @@ main (int argc, char **argv)
|
|||||||
|
|
||||||
config.config_file = SYSCONFDIR "/tinyproxy.conf";
|
config.config_file = SYSCONFDIR "/tinyproxy.conf";
|
||||||
config.godaemon = TRUE;
|
config.godaemon = TRUE;
|
||||||
|
|
||||||
process_cmdline (argc, argv);
|
|
||||||
|
|
||||||
log_message (LOG_INFO, "Initializing " PACKAGE " ...");
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Make sure the HTML error pages array is NULL to begin with.
|
* Make sure the HTML error pages array is NULL to begin with.
|
||||||
* (FIXME: Should have a better API for all this)
|
* (FIXME: Should have a better API for all this)
|
||||||
*/
|
*/
|
||||||
config.errorpages = NULL;
|
config.errorpages = NULL;
|
||||||
|
|
||||||
|
process_cmdline (argc, argv);
|
||||||
|
|
||||||
|
log_message (LOG_INFO, "Initializing " PACKAGE " ...");
|
||||||
|
|
||||||
/* Read in the settings from the config file */
|
/* Read in the settings from the config file */
|
||||||
config_file = fopen (config.config_file, "r");
|
config_file = fopen (config.config_file, "r");
|
||||||
if (!config_file) {
|
if (!config_file) {
|
||||||
|
Loading…
Reference in New Issue
Block a user