nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use %f, not %lf when formatting doubles

Browse Source 
%f is correct; %lf is only needed with scanf.  Apparently, on some
old BSDs, %lf is deprecated.

Didn't we do this before?  Yes, we did.  But we only got the
instances of %lf, not more complicated things like %.5lf .  This
patch tries to get everything.

Based on a patch for 3894 by grarpamp.
This commit is contained in:
Nick Mathewson 2012-05-16 14:26:35 -04:00
parent 75fc4dbbca
commit 0bec9f320b
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug3894_fmt_doubles Normal file
View File

@ -0,0 +1,4 @@
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.

2
src/or/dirserv.c
View File

@ -1939,7 +1939,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,

4
src/or/geoip.c
View File

@ -1026,9 +1026,9 @@ geoip_dirreq_stats_write(time_t now)
memset(ns_v2_responses, 0, sizeof(ns_v2_responses));
memset(ns_v3_responses, 0, sizeof(ns_v3_responses));
if (!geoip_get_mean_shares(now, &v2_share, &v3_share)) {
if (fprintf(out, "dirreq-v2-share %0.2lf%%\n", v2_share*100) < 0)
if (fprintf(out, "dirreq-v2-share %0.2f%%\n", v2_share*100) < 0)
goto done;
if (fprintf(out, "dirreq-v3-share %0.2lf%%\n", v3_share*100) < 0)
if (fprintf(out, "dirreq-v3-share %0.2f%%\n", v3_share*100) < 0)
goto done;
}

6
src/or/rephist.c
View File

@ -838,7 +838,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;
@ -888,10 +888,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":"",