summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2006-02-18 02:11:48 +0000
committerPeter Palfrader <peter@palfrader.org>2006-02-18 02:11:48 +0000
commit4f5e607389c0be385c3230b6dc2083a97ca79f07 (patch)
tree62445b135bd12fe5444ab94a41eefed616ea91c7
parentaa5443551d42a8d56f8f25e2dcead0f270ecf4ac (diff)
downloadtor-4f5e607389c0be385c3230b6dc2083a97ca79f07.tar.gz
tor-4f5e607389c0be385c3230b6dc2083a97ca79f07.zip
Finish log function renaming for non-GNUC systems
svn:r6034
-rw-r--r--src/common/log.c10
-rw-r--r--src/common/log.h10
2 files changed, 10 insertions, 10 deletions
diff --git a/src/common/log.c b/src/common/log.c
index 3ed788f499..2602f38342 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -264,7 +264,7 @@ _log_fn(int severity, uint32_t domain, const char *format, ...)
_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 *format, ...)
_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 *format, ...)
_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);
diff --git a/src/common/log.h b/src/common/log.h
index 6b3b4b2b87..e3f90f600b 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -142,11 +142,11 @@ void _log_fn(int severity, uint32_t domain,
#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__. */