[tor-commits] [tor/master] Revert HSv3 stats string formatting to its old %u self.

[dgoulet@xxxxxxxxxxxxxx]

commit 0bd12cfe99f16f1e3130e8866e15ff703cc4b828
Author: George Kadianakis <desnacked@xxxxxxxxxx>
Date:   Wed Nov 4 15:28:23 2020 +0200

    Revert HSv3 stats string formatting to its old %u self.
    
    The rest of rephist.c is doing the same kind of unsigned casting. For example
    see rep_hist_format_buffer_stats() and rep_hist_format_exit_stats().
    
    The previous switch to %ld made Appveyor fail:
        https://ci.appveyor.com/project/torproject/tor/builds/36118502
---
 src/feature/stats/rephist.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c
index 59f38fe603..f8d7887e65 100644
--- a/src/feature/stats/rephist.c
+++ b/src/feature/stats/rephist.c
@@ -2009,11 +2009,11 @@ rep_hist_format_hs_stats(time_t now, bool is_v3)
                            ONIONS_SEEN_EPSILON);
 
   format_iso_time(t, now);
-  tor_asprintf(&hs_stats_string, "%s %s (%ld s)\n"
+  tor_asprintf(&hs_stats_string, "%s %s (%u s)\n"
                "%s %"PRId64" delta_f=%d epsilon=%.2f bin_size=%d\n"
                "%s %"PRId64" delta_f=%d epsilon=%.2f bin_size=%d\n",
                is_v3 ? "hidserv-v3-stats-end" : "hidserv-stats-end",
-               t, now - start_of_hs_stats_interval,
+               t, (unsigned) (now - start_of_hs_stats_interval),
                is_v3 ?
                 "hidserv-rend-v3-relayed-cells" : "hidserv-rend-relayed-cells",
                obfuscated_cells_seen, REND_CELLS_DELTA_F,



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