Browse Source

Finish log function renaming for non-GNUC systems

svn:r6034
Peter Palfrader 18 years ago
parent
commit
4f5e607389
2 changed files with 10 additions and 10 deletions
  1. 5 5
      src/common/log.c
  2. 5 5
      src/common/log.h

+ 5 - 5
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);

+ 5 - 5
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__. */