Make Windows happy for time_t printf format

Our Windows compiler treats "time_t" as long long int but Linux likes it
long int so cast those to make Windows happy.

Signed-off-by: David Goulet <dgoulet@torproject.org>

diff --git a/src/or/hs_cell.c b/src/or/hs_cell.c
index a0e9074601218549522681d9526b60cccf2a9b06..7728b77053b94374825785573d440a4fd6252e73 100644 (file)
--- a/src/or/hs_cell.c
+++ b/src/or/hs_cell.c
@@ -444,7 +444,7 @@ hs_cell_parse_introduce2(hs_cell_introduce2_data_t *data,
                                        encrypted_section_len, &elapsed)) {
     log_warn(LD_REND, "Possible replay detected! An INTRODUCE2 cell with the"
                       "same ENCRYPTED section was seen %ld seconds ago. "
-                      "Dropping cell.", elapsed);
+                      "Dropping cell.", (long int) elapsed);
     goto done;
   }
 

diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c
index d0265dc5483384e42a2c9beb70db236a2c12d4b0..6d1cdd4eb078e06f5407f32549682dc13a6dee1e 100644 (file)
--- a/src/or/hs_circuit.c
+++ b/src/or/hs_circuit.c
@@ -589,7 +589,7 @@ can_relaunch_service_rendezvous_point(const origin_circuit_t *circ)
              safe_str_client(
                   extend_info_describe(circ->build_state->chosen_exit)),
              circ->build_state->failure_count,
-             circ->build_state->expiry_time);
+             (long int) circ->build_state->expiry_time);
     goto disallow;
   }
 
@@ -978,7 +978,8 @@ hs_circ_handle_introduce2(const hs_service_t *service,
      * cell), we are already trying to connect to that rend point (and may
      * have already succeeded); drop this cell. */
     log_info(LD_REND, "We received an INTRODUCE2 cell with same REND_COOKIE "
-                      "field %ld seconds ago. Dropping cell.", elapsed);
+                      "field %ld seconds ago. Dropping cell.",
+             (long int) elapsed);
     goto done;
   }
 

diff --git a/src/or/hs_service.c b/src/or/hs_service.c
index cb3a49cb8a8674b7528692203a9b97c645068501..3f6de0ba2d30dd4479e9b4dff114a41b701b7293 100644 (file)
--- a/src/or/hs_service.c
+++ b/src/or/hs_service.c
@@ -1875,8 +1875,9 @@ can_service_launch_intro_circuit(hs_service_t *service, time_t now)
                safe_str_client(service->onion_address),
                get_max_intro_circ_per_period(service),
                INTRO_CIRC_RETRY_PERIOD,
-               service->state.num_intro_circ_launched, elapsed_time,
-               INTRO_CIRC_RETRY_PERIOD - elapsed_time);
+               service->state.num_intro_circ_launched,
+               (long int) elapsed_time,
+               (long int) INTRO_CIRC_RETRY_PERIOD - elapsed_time);
       tor_free(msg);
     }
   }