diff options
| author | Nick Mathewson <nickm@torproject.org> | 2005-10-25 18:01:01 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2005-10-25 18:01:01 +0000 |
| commit | 5d85560d9e23147f85847f69a6255edfb432f565 (patch) | |
| tree | d45c170eefd08fd50cbe65d58746288a310cd66b /src/common | |
| parent | d7e136240a59f75985b1b752b07564150ea1acb4 (diff) | |
| download | tor-5d85560d9e23147f85847f69a6255edfb432f565.tar.gz tor-5d85560d9e23147f85847f69a6255edfb432f565.zip | |
Remove last vestiges of old logging interface.
svn:r5317
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/log.h | 14 | ||||
| -rw-r--r-- | src/common/util.h | 11 |
2 files changed, 3 insertions, 22 deletions
diff --git a/src/common/log.h b/src/common/log.h index 20b0e689ca..eec031f1a0 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -114,6 +114,7 @@ void change_callback_log_severity(int loglevelMin, int loglevelMax, /* Outputs a message to stdout */ void _log(int severity, unsigned int domain, const char *format, ...) CHECK_PRINTF(3,4); +#define log _log /* hack it so we don't conflict with log() as much */ #ifdef __GNUC__ void _log_fn(int severity, unsigned int domain, @@ -121,16 +122,8 @@ void _log_fn(int severity, unsigned int domain, CHECK_PRINTF(4,5); /** Log a message at level <b>severity</b>, using a pretty-printed version * of the current function name. */ -#ifdef OLD_LOG_INTERFACE -#define log_fn(severity, args...) \ - _log_fn(severity, LD_GENERAL, __PRETTY_FUNCTION__, args) -#define log(severity, args...) \ - _log(severity, LD_GENERAL, args) -#else #define log_fn(severity, domain, args...) \ _log_fn(severity, domain, __PRETTY_FUNCTION__, args) -#define log _log -#endif #define debug(domain, args...) \ _log_fn(LOG_DEBUG, domain, __PRETTY_FUNCTION__, args) #define info(domain, args...) \ @@ -141,7 +134,8 @@ void _log_fn(int severity, unsigned int domain, _log_fn(LOG_WARN, domain, __PRETTY_FUNCTION__, args) #define err(domain, args...) \ _log_fn(LOG_ERR, domain, __PRETTY_FUNCTION__, args) -#else + +#else /* ! defined(__GNUC__) */ void _log_fn(int severity, unsigned int domain, const char *format, ...); void _debug(unsigned int domain, const char *format, ...); @@ -150,8 +144,6 @@ void _notice(unsigned int domain, const char *format, ...); void _warn(unsigned int domain, const char *format, ...); void _err(unsigned int domain, const char *format, ...); -#define log _log /* hack it so we don't conflict with log() as much */ - #if defined(_MSC_VER) && _MSC_VER < 1300 /* MSVC 6 and earlier don't have __FUNCTION__, or even __LINE__. */ #define log_fn _log_fn diff --git a/src/common/util.h b/src/common/util.h index c80bbd6666..969d6152e7 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -38,16 +38,6 @@ */ #error "Sorry; we don't support building with NDEBUG." #else -#ifdef OLD_LOG_INTERFACE -#define tor_assert(expr) do { \ - if (!(expr)) { \ - log(LOG_ERR, "%s:%d: %s: Assertion %s failed; aborting.", \ - _SHORT_FILE_, __LINE__, __FUNCTION__, #expr); \ - fprintf(stderr,"%s:%d %s: Assertion %s failed; aborting.\n", \ - _SHORT_FILE_, __LINE__, __FUNCTION__, #expr); \ - abort(); /* unreached */ \ - } } while (0) -#else #define tor_assert(expr) do { \ if (!(expr)) { \ log(LOG_ERR, LD_BUG, "%s:%d: %s: Assertion %s failed; aborting.", \ @@ -57,7 +47,6 @@ abort(); /* unreached */ \ } } while (0) #endif -#endif #ifdef USE_DMALLOC #define DMALLOC_PARAMS , const char *file, const int line |