commit 2202ad7ab0132ed5505067aca9020caa05c918fd Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 23 14:52:51 2017 -0500

Fix a pair of compilation errors. --- src/or/networkstatus.c | 2 +- src/or/networkstatus.h | 3 ++- src/test/fuzz/fuzz_vrs.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 49ff12b..508cf6c 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -243,7 +243,7 @@ router_reload_consensus_networkstatus(void) }

/** Free all storage held by the vote_routerstatus object <b>rs</b>. */ -STATIC void +void vote_routerstatus_free(vote_routerstatus_t *rs) { vote_microdesc_hash_t *h, *next; diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index edf2dc7..66cd84c 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -132,8 +132,9 @@ document_signature_t *document_signature_dup(const document_signature_t *sig); void networkstatus_free_all(void); int networkstatus_get_weight_scale_param(networkstatus_t *ns);

+void vote_routerstatus_free(vote_routerstatus_t *rs); + #ifdef NETWORKSTATUS_PRIVATE -STATIC void vote_routerstatus_free(vote_routerstatus_t *rs); #ifdef TOR_UNIT_TESTS STATIC int networkstatus_set_current_consensus_from_ns(networkstatus_t *c, const char *flavor); diff --git a/src/test/fuzz/fuzz_vrs.c b/src/test/fuzz/fuzz_vrs.c index 406a4de..d2c0369 100644 --- a/src/test/fuzz/fuzz_vrs.c +++ b/src/test/fuzz/fuzz_vrs.c @@ -45,7 +45,8 @@ fuzz_cleanup(void) int fuzz_main(const uint8_t *data, size_t sz) { - char *str = tor_memdup_nulterm(data, sz), *s; + char *str = tor_memdup_nulterm(data, sz); + const char *s; routerstatus_t *rs_ns = NULL, *rs_md = NULL, *rs_vote = NULL; vote_routerstatus_t *vrs = tor_malloc_zero(sizeof(*vrs)); smartlist_t *tokens = smartlist_new();