diff options
| author | teor <teor@torproject.org> | 2019-08-05 20:04:08 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-09-25 16:37:07 +1000 |
| commit | 1ad1e84b17267f04960b322effaf57ea8a9690c0 (patch) | |
| tree | 01a2f29e140adb2f28d73dab84564fa4a131e57c | |
| parent | e1429d91480ee16ebe32be35263a4695e1795ff9 (diff) | |
| download | tor-1ad1e84b17267f04960b322effaf57ea8a9690c0.tar.gz tor-1ad1e84b17267f04960b322effaf57ea8a9690c0.zip | |
log: Move SEVERITY_MASK_IDX() to log.h
Move SEVERITY_MASK_IDX() to log.h private/unit tests section, so that
we can use it in log.c, the unit tests, and the fuzzers.
(The test and fuzzer code changes are in a subsequent commit.)
Preparation for bug 31334.
| -rw-r--r-- | src/lib/log/log.c | 4 | ||||
| -rw-r--r-- | src/lib/log/log.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/log/log.c b/src/lib/log/log.c index be6f459554..9373fd4042 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -55,10 +55,6 @@ #include <android/log.h> #endif // HAVE_ANDROID_LOG_H. -/** Given a severity, yields an index into log_severity_list_t.masks to use - * for that severity. */ -#define SEVERITY_MASK_IDX(sev) ((sev) - LOG_ERR) - /** @{ */ /** The string we stick at the end of a log message when it is too long, * and its length. */ diff --git a/src/lib/log/log.h b/src/lib/log/log.h index 4291418eb6..da4bcbe608 100644 --- a/src/lib/log/log.h +++ b/src/lib/log/log.h @@ -297,4 +297,10 @@ MOCK_DECL(STATIC void, logv, (int severity, log_domain_mask_t domain, va_list ap) CHECK_PRINTF(5,0)); #endif +#if defined(LOG_PRIVATE) || defined(TOR_UNIT_TESTS) +/** Given a severity, yields an index into log_severity_list_t.masks to use + * for that severity. */ +#define SEVERITY_MASK_IDX(sev) ((sev) - LOG_ERR) +#endif + #endif /* !defined(TOR_TORLOG_H) */ |