summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-12 08:17:48 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-12 08:17:48 -0400
commitf4e51990b911161b26138f40f3d370eeafd9ac2f (patch)
treec570ddd7ce92f9713e6a7563033b202efa731ec1
parentb2470f5140954db29e81498ad34d0c8cd7705064 (diff)
parent9876575d2c14ced3febca0c1a65808585fe8504d (diff)
downloadtor-f4e51990b911161b26138f40f3d370eeafd9ac2f.tar.gz
tor-f4e51990b911161b26138f40f3d370eeafd9ac2f.zip
Merge remote-tracking branch 'rl1987/bug26283'
-rw-r--r--changes/bug262834
-rw-r--r--src/or/routerlist.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug26283 b/changes/bug26283
new file mode 100644
index 0000000000..5ec856af84
--- /dev/null
+++ b/changes/bug26283
@@ -0,0 +1,4 @@
+ o Minor bugfixes (C correctness):
+ - Avoid casting return value of smartlist_len() to double as
+ compiler does not like it when -Wbad-function-cast is on.
+ Fixes bug 26283; bugfix on 0.2.4.10-alpha.
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 7603eb3ecf..8788dc0190 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2764,7 +2764,7 @@ frac_nodes_with_descriptors(const smartlist_t *sl,
if (node_has_any_descriptor(node))
n_with_descs++;
});
- return ((double)n_with_descs) / (double)smartlist_len(sl);
+ return ((double)n_with_descs) / smartlist_len(sl);
}
present = 0.0;