diff options
author | Nick Mathewson <nickm@torproject.org> | 2019-10-22 09:39:06 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2019-10-22 09:39:06 -0400 |
commit | b2d487ae2249a307cd23255dbb1a22241eefd6ef (patch) | |
tree | cd754fbe8d1c13264749f997f1221b1635a97e49 /src/lib/log/log.c | |
parent | 2d013bbe5cccaccf9ace0beec5a987fb80e850ad (diff) | |
parent | 7e7a4874b8fa333d1840cc5f2c0b118d6a0e7c47 (diff) | |
download | tor-b2d487ae2249a307cd23255dbb1a22241eefd6ef.tar.gz tor-b2d487ae2249a307cd23255dbb1a22241eefd6ef.zip |
Merge branch 'ticket31705_v2' into ticket31705_v2_merged
Conflicts:
src/feature/dirparse/authcert_parse.c
src/feature/dirparse/ns_parse.c
src/feature/hs/hs_service.c
src/lib/conf/conftesting.h
src/lib/log/log.h
src/lib/thread/threads.h
src/test/test_options.c
These conflicts were mostly related to autostyle improvements, with
one or two due to doxygen fixes.
Diffstat (limited to 'src/lib/log/log.c')
-rw-r--r-- | src/lib/log/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/log/log.c b/src/lib/log/log.c index dc53b386b0..cb92ef07ef 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -523,7 +523,7 @@ logfile_deliver(logfile_t *lf, const char *buf, size_t msg_len, * pass them, and some very old ones do not detect overflow so well. * Regrettably, they call their maximum line length MAXLINE. */ #if MAXLINE < 64 -#warn "MAXLINE is a very low number; it might not be from syslog.h after all" +#warning "MAXLINE is a very low number; it might not be from syslog.h." #endif char *m = msg_after_prefix; if (msg_len >= MAXLINE) |