diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-05-31 00:07:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-05-31 00:07:52 -0400 |
| commit | ffc21b653f08e3826867c14d44d6543d262bb417 (patch) | |
| tree | 7e7bfcd648f0ac2180663c11cc852795b60de39f /src/common/log.c | |
| parent | fe68a80f8f1e687d9e3dcdf6dfc5d0a8f3524335 (diff) | |
| parent | 3a9351b57e528b1d0bd2e72bcf78db7c91b2ff8f (diff) | |
| download | tor-ffc21b653f08e3826867c14d44d6543d262bb417.tar.gz tor-ffc21b653f08e3826867c14d44d6543d262bb417.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
(For bug 5969 fix)
Diffstat (limited to 'src/common/log.c')
| -rw-r--r-- | src/common/log.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/common/log.c b/src/common/log.c index df27066f92..f509ddcd6e 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -137,6 +137,13 @@ static void close_log(logfile_t *victim); static char *domain_to_string(log_domain_mask_t domain, char *buf, size_t buflen); +static INLINE char *format_msg(char *buf, size_t buf_len, + log_domain_mask_t domain, int severity, const char *funcname, + const char *format, va_list ap, size_t *msg_len_out) + CHECK_PRINTF(6,0); +static void logv(int severity, log_domain_mask_t domain, const char *funcname, + const char *format, va_list ap) + CHECK_PRINTF(4,0); /** Name of the application: used to generate the message we write at the * start of each new log. */ |