[tor-commits] [tor/master] Fix a few clang warnings.

nickm at torproject.org nickm at torproject.org
Wed Dec 14 21:05:48 UTC 2016


commit a8ac2a62cb29bc9831bafc477927b31a3204af98
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 14 16:01:27 2016 -0500

    Fix a few clang warnings.
---
 src/or/hs_circuitmap.c     | 4 ++--
 src/test/test_hs_service.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/hs_circuitmap.c b/src/or/hs_circuitmap.c
index 321c8dd..5003b4b 100644
--- a/src/or/hs_circuitmap.c
+++ b/src/or/hs_circuitmap.c
@@ -69,11 +69,11 @@ hs_circuit_hash_token(const or_circuit_t *circuit)
 HT_PROTOTYPE(hs_circuitmap_ht, // The name of the hashtable struct
              or_circuit_t,    // The name of the element struct,
              hs_circuitmap_node,        // The name of HT_ENTRY member
-             hs_circuit_hash_token, hs_circuits_have_same_token);
+             hs_circuit_hash_token, hs_circuits_have_same_token)
 
 HT_GENERATE2(hs_circuitmap_ht, or_circuit_t, hs_circuitmap_node,
              hs_circuit_hash_token, hs_circuits_have_same_token,
-             0.6, tor_reallocarray, tor_free_);
+             0.6, tor_reallocarray, tor_free_)
 
 #ifdef TOR_UNIT_TESTS
 
diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 8890c11..039d727 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -23,7 +23,7 @@ static void
 test_gen_establish_intro_cell(void *arg)
 {
   (void) arg;
-  int retval;
+  ssize_t retval;
   uint8_t circuit_key_material[DIGEST_LEN] = {0};
   uint8_t buf[RELAY_PAYLOAD_SIZE];
   hs_cell_establish_intro_t *cell_out = NULL;



More information about the tor-commits mailing list