tor

commit a9a76aa6aea24ff4b838d11b80f808e9174cb678
parent dd9f255e5b525f6801e149fb5da510e58baccf9e
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 20 Jun 2017 13:35:44 -0400

Merge branch 'maint-0.3.1'

Diffstat:
M
src/common/compress.c
 | 
12
++++++------
M
src/common/compress_none.c
 | 
2
+-

2 files changed, 7 insertions(+), 7 deletions(-)
diff --git 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;
diff --git 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