[tor-commits] [tor/release-0.3.1] mingw/windows printf lacks %zd ; use %lu and casts instead

[nickm@xxxxxxxxxxxxxx]

commit 945256188ab3a9b5842455f714d51e1871b0bf69
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jun 20 12:12:55 2017 -0400

    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 e65894d..c16d1b5 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;



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits