Commit b4bd4964 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'public/format_doubles' 

Conflicts:
	src/or/geoip.c
parents 981e896d 0bec9f32

changes/bug3894_fmt_doubles

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - Format more doubles with %f, not %lf. Patch from grarpamp to make

      Tor build correctly on older BSDs again. Fixes bug 3894; bugfix on

      Tor 0.2.0.8-alpha.

src/or/dirserv.c

+1 −1
Original line number Diff line number Diff line
@@ -1995,7 +1995,7 @@ dirserv_compute_performance_thresholds(routerlist_t *rl) 
  log(LOG_INFO, LD_DIRSERV,

      "Cutoffs: For Stable, %lu sec uptime, %lu sec MTBF. "

      "For Fast: %lu bytes/sec. "

      "For Guard: WFU %.03lf%%, time-known %lu sec, "

      "For Guard: WFU %.03f%%, time-known %lu sec, "

      "and bandwidth %lu or %lu bytes/sec. We%s have enough stability data.",

      (unsigned long)stable_uptime,

      (unsigned long)stable_mtbf,

src/or/geoip.c

+2 −2
Original line number Diff line number Diff line
@@ -1025,9 +1025,9 @@ geoip_format_dirreq_stats(time_t now) 
#undef RESPONSE_GRANULARITY



  if (!geoip_get_mean_shares(now, &v2_share, &v3_share)) {

    tor_asprintf(&v2_share_string, "dirreq-v2-share %0.2lf%%\n",

    tor_asprintf(&v2_share_string, "dirreq-v2-share %0.2f%%\n",

                 v2_share*100);

    tor_asprintf(&v3_share_string, "dirreq-v3-share %0.2lf%%\n",

    tor_asprintf(&v3_share_string, "dirreq-v3-share %0.2f%%\n",

                 v3_share*100);

  }

src/or/rephist.c

+3 −3
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ rep_hist_record_mtbf_data(time_t now, int missing_means_down) 
      format_iso_time(time_buf, hist->start_of_run);

      t = time_buf;

    }

    PRINTF((f, "+MTBF %lu %.5lf%s%s\n",

    PRINTF((f, "+MTBF %lu %.5f%s%s\n",

            hist->weighted_run_length, hist->total_run_weights,

            t ? " S=" : "", t ? t : ""));

    t = NULL;
@@ -889,10 +889,10 @@ rep_hist_format_router_status(or_history_t *hist, time_t now) 
  tor_asprintf(&cp,

               "%s%s%s"

               "%s%s%s"

               "wfu %0.3lf\n"

               "wfu %0.3f\n"

               " weighted-time %lu\n"

               " weighted-uptime %lu\n"

               "mtbf %0.1lf\n"

               "mtbf %0.1f\n"

               " weighted-run-length %lu\n"

               " total-run-weights %f\n",

               up?"uptime-started ":"", up?sor_buf:"", up?" UTC\n":"",