summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-09-05 20:49:25 -0400
committerNick Mathewson <nickm@torproject.org>2012-09-05 20:49:25 -0400
commit5d679caa32c71a8bc7d4ed4ab716349e603e642c (patch)
tree7f66af316df444ce38ca2d4d9a37307f358c13f1
parenta504a81d22c9f000fefd44093c4a18693b8228fc (diff)
downloadtor-5d679caa32c71a8bc7d4ed4ab716349e603e642c.tar.gz
tor-5d679caa32c71a8bc7d4ed4ab716349e603e642c.zip
Fix warning when implicitly casting strlen(microdesc) to int
Harmless unless we somehow generate a microdesc of more than INT_MAX bytes.
-rw-r--r--changes/ssize_t_warning4
-rw-r--r--src/or/dirvote.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/ssize_t_warning b/changes/ssize_t_warning
new file mode 100644
index 0000000000..01609ccdfb
--- /dev/null
+++ b/changes/ssize_t_warning
@@ -0,0 +1,4 @@
+ o Minor build fixes:
+ - Fix a harmless (in this case) build warning for implicitly
+ converting a strlen() to an int. Bugfix on 0.2.4.1-alpha.
+
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 8e85b2bcca..ea85636b3b 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -3606,7 +3606,7 @@ dirvote_format_microdesc_vote_line(char *out_buf, size_t out_buf_len,
int consensus_method_low,
int consensus_method_high)
{
- int ret = -1;
+ ssize_t ret = -1;
char d64[BASE64_DIGEST256_LEN+1];
char *microdesc_consensus_methods =
make_consensus_method_list(consensus_method_low,