[or-cvs] Finish log function renaming for non-GNUC systems

Peter Palfrader weasel at seul.org
Sat Feb 18 02:11:50 UTC 2006


Update of /home/or/cvsroot/tor/src/common
In directory moria:/tmp/cvs-serv28682/common

Modified Files:
	log.c log.h 
Log Message:
Finish log function renaming for non-GNUC systems

Index: log.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/common/log.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -d -r1.113 -r1.114
--- log.c	9 Feb 2006 05:46:48 -0000	1.113
+++ log.c	18 Feb 2006 02:11:48 -0000	1.114
@@ -264,7 +264,7 @@ _log_fn(int severity, uint32_t domain, c
   _log_fn_function_name = NULL;
 }
 void
-debug(uint32_t domain, const char *format, ...)
+log_debug(uint32_t domain, const char *format, ...)
 {
   va_list ap;
   va_start(ap,format);
@@ -273,7 +273,7 @@ debug(uint32_t domain, const char *forma
   _log_fn_function_name = NULL;
 }
 void
-info(uint32_t domain, const char *format, ...)
+log_info(uint32_t domain, const char *format, ...)
 {
   va_list ap;
   va_start(ap,format);
@@ -282,7 +282,7 @@ info(uint32_t domain, const char *format
   _log_fn_function_name = NULL;
 }
 void
-notice(uint32_t domain, const char *format, ...)
+log_notice(uint32_t domain, const char *format, ...)
 {
   va_list ap;
   va_start(ap,format);
@@ -291,7 +291,7 @@ notice(uint32_t domain, const char *form
   _log_fn_function_name = NULL;
 }
 void
-warn(uint32_t domain, const char *format, ...)
+log_warn(uint32_t domain, const char *format, ...)
 {
   va_list ap;
   va_start(ap,format);
@@ -300,7 +300,7 @@ warn(uint32_t domain, const char *format
   _log_fn_function_name = NULL;
 }
 void
-err(uint32_t domain, const char *format, ...)
+log_err(uint32_t domain, const char *format, ...)
 {
   va_list ap;
   va_start(ap,format);

Index: log.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/common/log.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -d -r1.65 -r1.66
--- log.h	13 Feb 2006 08:01:59 -0000	1.65
+++ log.h	18 Feb 2006 02:11:48 -0000	1.66
@@ -142,11 +142,11 @@ void _log_fn(int severity, uint32_t doma
 #else /* ! defined(__GNUC__) */
 
 void _log_fn(int severity, uint32_t domain, const char *format, ...);
-void debug(uint32_t domain, const char *format, ...);
-void info(uint32_t domain, const char *format, ...);
-void notice(uint32_t domain, const char *format, ...);
-void warn(uint32_t domain, const char *format, ...);
-void err(uint32_t domain, const char *format, ...);
+void log_debug(uint32_t domain, const char *format, ...);
+void log_info(uint32_t domain, const char *format, ...);
+void log_notice(uint32_t domain, const char *format, ...);
+void log_warn(uint32_t domain, const char *format, ...);
+void log_err(uint32_t domain, const char *format, ...);
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
 /* MSVC 6 and earlier don't have __FUNCTION__, or even __LINE__. */



More information about the tor-commits mailing list