summaryrefslogtreecommitdiff
path: root/src/common/log.c
diff options
context:
space:
mode:
authorteor <teor2345@gmail.com>2015-01-10 16:34:10 +1100
committerteor <teor2345@gmail.com>2015-01-10 16:34:10 +1100
commitc200ab46b85cece87a4bcdbaacd41bc6539d1671 (patch)
treef17e2c59dd076a73cce9787ecad3f8eeec88f705 /src/common/log.c
parentfd7e9e9030cee9d8e863cea3f3f90226ae66fdfe (diff)
parent6a9cae2e1dafb756b30fda541e8b5d68cfd45f89 (diff)
downloadtor-c200ab46b85cece87a4bcdbaacd41bc6539d1671.tar.gz
tor-c200ab46b85cece87a4bcdbaacd41bc6539d1671.zip
Merge branch 'bug14001-clang-warning' into bug13111-empty-key-files-fn-empty
Conflicts: src/or/router.c Choose newer comment. Merge changes to comment and function invocation.
Diffstat (limited to 'src/common/log.c')
-rw-r--r--src/common/log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/log.c b/src/common/log.c
index ad0da7da6b..0a21ffbd44 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -451,7 +451,7 @@ MOCK_IMPL(STATIC void,
logv,(int severity, log_domain_mask_t domain, const char *funcname,
const char *suffix, const char *format, va_list ap))
{
- char buf[10024];
+ char buf[10240];
size_t msg_len = 0;
int formatted = 0;
logfile_t *lf;