From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Sep 2012 00:49:25 +0000 (-0400)
Subject: Fix warning when implicitly casting strlen(microdesc) to int
X-Git-Tag: tor-0.2.4.2-alpha~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d679caa32c71a8bc7d4ed4ab716349e603e642c;p=thirdparty%2Ftor.git

Fix warning when implicitly casting strlen(microdesc) to int

Harmless unless we somehow generate a microdesc of more than INT_MAX
bytes.
---

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,