removed loglevel from global namespace. severity level is set using log() with... (be25ffd5) · Commits · Gaba / Tor

src/common/log.c

+19 −12

Original line number	Diff line number	Diff line
		@@ -8,8 +8,11 @@
		/*
		* Changes :
		* $Log$
		* Revision 1.1 2002/06/26 22:45:50 arma
		* Initial revision
		* Revision 1.2 2002/07/12 18:14:16 montrose
		* removed loglevel from global namespace. severity level is set using log() with a NULL format argument now. example: log(LOG_ERR,NULL);
		*
		* Revision 1.1.1.1 2002/06/26 22:45:50 arma
		* initial commit: current code
		*
		* Revision 1.11 2002/06/14 20:44:57 mp292
		* * empty log message *
		@@ -54,14 +57,15 @@
		#include <errno.h>
		#include "log.h"

		void log_internal(int severity, const char *format, va_list ap);

		/* Outputs a message to stdout */
		void log(int severity, const char *format, ...)
		{
		extern int loglevel;
		static int loglevel = LOG_DEBUG;
		va_list ap;

		if ( format )
		{

		va_start(ap,format);

		if (severity <= loglevel)
		@@ -72,3 +76,6 @@ void log(int severity, const char *format, ...)

		va_end(ap);
		}
		else
		loglevel = severity;
		}

+7 −2

Original line number	Diff line number	Diff line
		@@ -8,6 +8,9 @@
		/*
		* Changes :
		* $Log$
		* Revision 1.3 2002/07/12 18:14:16 montrose
		* removed loglevel from global namespace. severity level is set using log() with a NULL format argument now. example: log(LOG_ERR,NULL);
		*
		* Revision 1.2 2002/07/02 09:16:16 arma
		* httpap now prepends dest_addr and dest_port strings with their length.
		*
		@@ -58,7 +61,6 @@
		#include "httpap.h"
		#include "http.h"

		int loglevel = LOG_ERR;
		struct timeval conn_tout;
		struct timeval *conn_toutp = &conn_tout;

		@@ -464,6 +466,7 @@ int handle_connection(int new_sock, struct hostent *local, struct sockaddr_in re

		int main(int argc, char *argv[])
		{
		int loglevel = LOG_DEBUG;
		int retval = 0;

		char c; /* command-line option */
		@@ -559,6 +562,8 @@ int main(int argc, char *argv[])
		}
		}

		log(loglevel,NULL); /* assign severity level for logger */

		/* the -f option is mandatory */
		if (conf_filename == NULL)
		{

+7 −3

Original line number	Diff line number	Diff line
		@@ -8,8 +8,11 @@
		/*
		* Changes :
		* $Log$
		* Revision 1.1 2002/06/26 22:45:50 arma
		* Initial revision
		* Revision 1.2 2002/07/12 18:14:16 montrose
		* removed loglevel from global namespace. severity level is set using log() with a NULL format argument now. example: log(LOG_ERR,NULL);
		*
		* Revision 1.1.1.1 2002/06/26 22:45:50 arma
		* initial commit: current code
		*
		* Revision 1.37 2002/06/14 20:45:56 mp292
		* * empty log message *
		@@ -163,7 +166,6 @@
		/* global variables */

		/* default logging threshold */
		int loglevel = LOG_ERR;
		struct timeval conn_tout;
		struct timeval *conn_toutp = &conn_tout;

		@@ -703,6 +705,8 @@ int main(int argc, char *argv[])

		struct rlimit cd_limit; /* resource limit to prevent core dumps */

		log(LOG_ERR,NULL); /* assign severity level for logger */

		/* prevent core dump */
		retval = getrlimit(RLIMIT_CORE, &cd_limit);
		if (retval == -1)

+2 −4

Original line number	Diff line number	Diff line
		@@ -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();

+0 −2