Fix up some windows compilation issues.

These were mostly cases where our previous macros had been casting,
and the values that we were trying to printf were not in fact
uint64_t.

diff --git a/src/common/procmon.c b/src/common/procmon.c
index 9799594d3ead6945ec9771bd5da78b87454aec7a..6c2b3e71e59a05a4e1c4ac302529c12b639e73b5 100644 (file)
--- a/src/common/procmon.c
+++ b/src/common/procmon.c
@@ -35,8 +35,8 @@ typedef int pid_t;
 #define PID_T_FORMAT "%d"
 #elif (SIZEOF_PID_T == SIZEOF_LONG)
 #define PID_T_FORMAT "%ld"
-#elif (SIZEOF_PID_T == SIZEOF_INT64_T)
-#define PID_T_FORMAT I64_FORMAT
+#elif (SIZEOF_PID_T == 8)
+#define PID_T_FORMAT "%"PRId64
 #else
 #error Unknown: SIZEOF_PID_T
 #endif /* (0 == SIZEOF_PID_T) && defined(_WIN32) || ... */

diff --git a/src/lib/time/tvdiff.c b/src/lib/time/tvdiff.c
index 0af45a208b0db42be264a2d31e424ad41a4d8664..cfd1ace77141c3f8bee29da7294d74f206cde855 100644 (file)
--- a/src/lib/time/tvdiff.c
+++ b/src/lib/time/tvdiff.c
@@ -52,14 +52,14 @@ tv_udiff(const struct timeval *start, const struct timeval *end)
   if (start->tv_usec > TOR_USEC_PER_SEC || start->tv_usec < 0) {
     log_warn(LD_GENERAL, "comparing times on microsecond detail with bad "
              "start tv_usec: %"PRId64 " microseconds",
-             (start->tv_usec));
+             (int64_t)start->tv_usec);
     return LONG_MAX;
   }
 
   if (end->tv_usec > TOR_USEC_PER_SEC || end->tv_usec < 0) {
     log_warn(LD_GENERAL, "comparing times on microsecond detail with bad "
              "end tv_usec: %"PRId64 " microseconds",
-             (end->tv_usec));
+             (int64_t)end->tv_usec);
     return LONG_MAX;
   }
 
@@ -101,14 +101,14 @@ tv_mdiff(const struct timeval *start, const struct timeval *end)
   if (start->tv_usec > TOR_USEC_PER_SEC || start->tv_usec < 0) {
     log_warn(LD_GENERAL, "comparing times on millisecond detail with bad "
              "start tv_usec: %"PRId64 " microseconds",
-             (start->tv_usec));
+             (int64_t)start->tv_usec);
     return LONG_MAX;
   }
 
   if (end->tv_usec > TOR_USEC_PER_SEC || end->tv_usec < 0) {
     log_warn(LD_GENERAL, "comparing times on millisecond detail with bad "
              "end tv_usec: %"PRId64 " microseconds",
-             (end->tv_usec));
+             (int64_t)end->tv_usec);
     return LONG_MAX;
   }
 
@@ -124,7 +124,7 @@ tv_mdiff(const struct timeval *start, const struct timeval *end)
   if (secdiff > (int64_t)(LONG_MAX/1000 - 2) ||
       secdiff < (int64_t)(LONG_MIN/1000 + 1)) {
     log_warn(LD_GENERAL, "comparing times on millisecond detail too far "
-             "apart: %"PRId64 " seconds", (secdiff));
+             "apart: %"PRId64 " seconds", (int64_t)secdiff);
     return LONG_MAX;
   }
 

diff --git a/src/lib/wallclock/tm_cvt.c b/src/lib/wallclock/tm_cvt.c
index 0a1a1cd4381db658948a9e12e62a4fce84ba4627..31d929e635a3627828a34152f97efb84c359ec8a 100644 (file)
--- a/src/lib/wallclock/tm_cvt.c
+++ b/src/lib/wallclock/tm_cvt.c
@@ -102,7 +102,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf,
   if (err_out) {
     tor_asprintf(err_out, "%s(%"PRId64") failed with error %s: %s",
                  islocal?"localtime":"gmtime",
-                 timep?(*timep):0,
+                 timep?((int64_t)*timep):0,
                  strerror(errno),
                  outcome);
   }

diff --git a/src/or/channel.c b/src/or/channel.c
index 9b57eccd7d8461223231548e728f5775e012130d..6ab02f3b298d9bee2d8790fc0600e3ee18efee22 100644 (file)
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -2544,10 +2544,10 @@ channel_dump_statistics, (channel_t *chan, int severity))
       " (%"PRIu64 " seconds ago) "
       "and last active at %"PRIu64 " (%"PRIu64 " seconds ago)",
       (chan->global_identifier),
-      (chan->timestamp_created),
-      (now - chan->timestamp_created),
-      (chan->timestamp_active),
-      (now - chan->timestamp_active));
+      (uint64_t)(chan->timestamp_created),
+      (uint64_t)(now - chan->timestamp_created),
+      (uint64_t)(chan->timestamp_active),
+      (uint64_t)(now - chan->timestamp_active));
 
   /* Handle digest. */
   if (!tor_digest_is_zero(chan->identity_digest)) {
@@ -2624,20 +2624,20 @@ channel_dump_statistics, (channel_t *chan, int severity))
       " * Channel %"PRIu64 " was last used by a "
       "client at %"PRIu64 " (%"PRIu64 " seconds ago)",
       (chan->global_identifier),
-      (chan->timestamp_client),
-      (now - chan->timestamp_client));
+      (uint64_t)(chan->timestamp_client),
+      (uint64_t)(now - chan->timestamp_client));
   tor_log(severity, LD_GENERAL,
       " * Channel %"PRIu64 " last received a cell "
       "at %"PRIu64 " (%"PRIu64 " seconds ago)",
       (chan->global_identifier),
-      (chan->timestamp_recv),
-      (now - chan->timestamp_recv));
+      (uint64_t)(chan->timestamp_recv),
+      (uint64_t)(now - chan->timestamp_recv));
   tor_log(severity, LD_GENERAL,
       " * Channel %"PRIu64 " last transmitted a cell "
       "at %"PRIu64 " (%"PRIu64 " seconds ago)",
       (chan->global_identifier),
-      (chan->timestamp_xmit),
-      (now - chan->timestamp_xmit));
+      (uint64_t)(chan->timestamp_xmit),
+      (uint64_t)(now - chan->timestamp_xmit));
 
   /* Describe counters and rates */
   tor_log(severity, LD_GENERAL,
@@ -2727,19 +2727,19 @@ channel_listener_dump_statistics(channel_listener_t *chan_l, int severity)
       " (%"PRIu64 " seconds ago) "
       "and last active at %"PRIu64 " (%"PRIu64 " seconds ago)",
       (chan_l->global_identifier),
-      (chan_l->timestamp_created),
-      (now - chan_l->timestamp_created),
-      (chan_l->timestamp_active),
-      (now - chan_l->timestamp_active));
+      (uint64_t)(chan_l->timestamp_created),
+      (uint64_t)(now - chan_l->timestamp_created),
+      (uint64_t)(chan_l->timestamp_active),
+      (uint64_t)(now - chan_l->timestamp_active));
 
   tor_log(severity, LD_GENERAL,
       " * Channel listener %"PRIu64 " last accepted an incoming "
         "channel at %"PRIu64 " (%"PRIu64 " seconds ago) "
         "and has accepted %"PRIu64 " channels in total",
         (chan_l->global_identifier),
-        (chan_l->timestamp_accepted),
-        (now - chan_l->timestamp_accepted),
-        (chan_l->n_accepted));
+        (uint64_t)(chan_l->timestamp_accepted),
+        (uint64_t)(now - chan_l->timestamp_accepted),
+        (uint64_t)(chan_l->n_accepted));
 
   /*
    * If it's sensible to do so, get the rate of incoming channels on this
@@ -3477,4 +3477,3 @@ channel_update_bad_for_new_circs(const char *digest, int force)
     channel_rsa_id_group_set_badness(&(*iter)->channel_list, force);
   }
 }
-

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index a50477c4ca406fc692ab2fdc377f9e428868e4fe..0b5a6bf4f38452580d99ed2474d11bd1b35705f7 100644 (file)
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -2601,10 +2601,10 @@ circuits_handle_oom(size_t current_allocation)
 
  done_recovering_mem:
 
-  log_notice(LD_GENERAL, "Removed %"PRIu64" bytes by killing %d circuits; "
+  log_notice(LD_GENERAL, "Removed %"TOR_PRIuSZ" bytes by killing %d circuits; "
              "%d circuits remain alive. Also killed %d non-linked directory "
              "connections.",
-             (mem_recovered),
+             mem_recovered,
              n_circuits_killed,
              smartlist_len(circlist) - n_circuits_killed,
              n_dirconns_killed);

diff --git a/src/or/directory.c b/src/or/directory.c
index 907995479a4548d87747ff700f139521616eb58a..3407ffa37804184b136ef16e26c893909cad4cb1 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1929,8 +1929,8 @@ directory_send_command(dir_connection_t *conn,
 
   log_debug(LD_DIR,
             "Sent request to directory server '%s:%d': "
-            "(purpose: %d, request size: %"PRIu64 ", "
-            "payload size: %"PRIu64 ")",
+            "(purpose: %d, request size: %"TOR_PRIuSZ", "
+            "payload size: %"TOR_PRIuSZ")",
             conn->base_.address, conn->base_.port,
             conn->base_.purpose,
             (total_request_len),
@@ -2420,7 +2420,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
 
   tor_log(LOG_DEBUG, LD_DIR,
             "Received response from directory server '%s:%d': %d %s "
-            "(purpose: %d, response size: %"PRIu64
+            "(purpose: %d, response size: %"TOR_PRIuSZ
 #ifdef MEASUREMENTS_21206
             ", data cells received: %d, data cells sent: %d"
 #endif
@@ -5952,4 +5952,3 @@ dir_split_resource_into_spoolable(const char *resource,
   smartlist_free(fingerprints);
   return r;
 }
-

diff --git a/src/test/test_util.c b/src/test/test_util.c
index e6348bfea82dc6bbba2944c836ebc41a1c32305a..c2c33afea46fb1c60920ed2ed006a1edd1c357b6 100644 (file)
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -5557,7 +5557,7 @@ test_util_max_mem(void *arg)
   tt_int_op(r, OP_EQ, r2);
   tt_uint_op(memory2, OP_EQ, memory1);
 
-  TT_BLATHER(("System memory: %"PRIu64, (memory1)));
+  TT_BLATHER(("System memory: %"TOR_PRIuSZ, (memory1)));
 
   if (r==0) {
     /* You have at least a megabyte. */