removed loglevel from global namespace. severity level is set using log() with a NULL format argument now. example: log(LOG_ERR,NULL);

svn:r44

2 files changed, 2 insertions, 6 deletions

diff --git a/src/or/main.c b/src/or/main.c
index 671cc72e2..b40ef9ee2 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -4,7 +4,6 @@
 /********* START VARIABLES **********/
 
 static or_options_t options; /* command-line and config-file options */
-int loglevel;
 int global_role;
 
 static connection_t *connection_array[MAXCONNECTIONS] =
@@ -332,9 +331,8 @@ int main(int argc, char *argv[]) {
   signal (SIGINT, catch); /* to catch ^c so we can exit cleanly */
 
   if ( getoptions(argc,argv,&options) ) exit(1);
-  /* assign global vars from options. maybe get rid of these globals later */
-  loglevel = options.loglevel;
-  global_role = options.GlobalRole;
+  log(options.loglevel,NULL);         /* assign logging severity level from options */
+  global_role = options.GlobalRole;   /* assign global_role from options. FIX: remove from global namespace later. */
 
   ERR_load_crypto_strings();
   retval = do_main_loop();
diff --git a/src/or/test_config.c b/src/or/test_config.c
index 171adb659..f9a3fdd40 100644
--- a/src/or/test_config.c
+++ b/src/or/test_config.c
@@ -1,7 +1,5 @@
 #include "or.h"
 
-int loglevel;
-
 int main(int ac, char **av)
 {
    or_options_t options;