From 25edb41e6fd00ea902dab40c997dbce8b49eb884 Mon Sep 17 00:00:00 2001 From: Taylor Yu Date: Tue, 20 Jun 2017 11:23:31 -0400 Subject: [PATCH 1/2] Fix compress_none.c header comment The Doxygen \file markup for compress_none.c had the wrong filename. Fixes #22638. --- src/common/compress_none.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compress_none.c b/src/common/compress_none.c index b76e6010ec..34314e4af7 100644 --- a/src/common/compress_none.c +++ b/src/common/compress_none.c @@ -4,7 +4,7 @@ /* See LICENSE for licensing information */ /** - * \file compress_lzma.c + * \file compress_none.c * \brief Compression backend for identity compression. * * We actually define this backend so that we can treat the identity transform From 945256188ab3a9b5842455f714d51e1871b0bf69 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 20 Jun 2017 12:12:55 -0400 Subject: [PATCH 2/2] mingw/windows printf lacks %zd ; use %lu and casts instead (This approach can lose accuracy, but it's only in debug-level messages.) Fixes windows compilation. Bugfix on recent compress.c changes; bug not in any released Tor. --- src/common/compress.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/compress.c b/src/common/compress.c index e65894d9d2..c16d1b51ee 100644 --- a/src/common/compress.c +++ b/src/common/compress.c @@ -105,8 +105,8 @@ tor_compress_impl(int compress, if (stream == NULL) { log_warn(LD_GENERAL, "NULL stream while %scompressing", compress?"":"de"); - log_debug(LD_GENERAL, "method: %d level: %d at len: %zd", - method, compression_level, in_len); + log_debug(LD_GENERAL, "method: %d level: %d at len: %lu", + method, compression_level, (unsigned long)in_len); return -1; } @@ -146,15 +146,15 @@ tor_compress_impl(int compress, "Unexpected %s while %scompressing", complete_only?"end of input":"result", compress?"":"de"); - log_debug(LD_GENERAL, "method: %d level: %d at len: %zd", - method, compression_level, in_len); + log_debug(LD_GENERAL, "method: %d level: %d at len: %lu", + method, compression_level, (unsigned long)in_len); goto err; } else { if (in_len != 0) { log_fn(protocol_warn_level, LD_PROTOCOL, "Unexpected extra input while decompressing"); - log_debug(LD_GENERAL, "method: %d level: %d at len: %zd", - method, compression_level, in_len); + log_debug(LD_GENERAL, "method: %d level: %d at len: %lu", + method, compression_level, (unsigned long)in_len); goto err; } else { goto done;