summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-11-04 00:29:35 +0100
committerMichael Adam <obnox@samba.org>2009-11-14 12:13:10 +0100
commitd8da7f55f7111174c49d716046d997f7b7f23f59 (patch)
tree066ae24f5a09c36cee8c8c145854cd1029f6472c /src
parent9274b5556ee3c546176936580c9bb5403b2c09e6 (diff)
downloadtinyproxy-d8da7f55f7111174c49d716046d997f7b7f23f59.tar.gz
tinyproxy-d8da7f55f7111174c49d716046d997f7b7f23f59.zip
main: move initialization of default config values closer together
Michael
Diffstat (limited to 'src')
-rw-r--r--src/main.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main.c b/src/main.c
index e22b9e7..ef46d00 100644
--- a/src/main.c
+++ b/src/main.c
@@ -313,17 +313,16 @@ main (int argc, char **argv)
config.config_file = SYSCONFDIR "/tinyproxy.conf";
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.
* (FIXME: Should have a better API for all this)
*/
config.errorpages = NULL;
+ process_cmdline (argc, argv);
+
+ log_message (LOG_INFO, "Initializing " PACKAGE " ...");
+
/* Read in the settings from the config file */
config_file = fopen (config.config_file, "r");
if (!config_file) {