summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-01-23 14:52:51 -0500
committerNick Mathewson <nickm@torproject.org>2017-01-30 08:37:27 -0500
commit2202ad7ab0132ed5505067aca9020caa05c918fd (patch)
tree263e04d81f5c2e1a4848e365ccbcdc521bc2cc85 /src
parent1d8e9e8c699e68cdbb33ab41ccbd65e3dab8ff6b (diff)
downloadtor-2202ad7ab0132ed5505067aca9020caa05c918fd.tar.gz
tor-2202ad7ab0132ed5505067aca9020caa05c918fd.zip
Fix a pair of compilation errors.
Diffstat (limited to 'src')
-rw-r--r--src/or/networkstatus.c2
-rw-r--r--src/or/networkstatus.h3
-rw-r--r--src/test/fuzz/fuzz_vrs.c3
3 files changed, 5 insertions, 3 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 49ff12bd6c..508cf6c5b6 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 edf2dc7b7a..66cd84c88e 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 406a4de5f3..d2c0369f27 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();