aboutsummaryrefslogtreecommitdiff
path: root/src/feature/nodelist/networkstatus.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-12-05 09:24:51 -0500
committerNick Mathewson <nickm@torproject.org>2018-12-05 09:24:51 -0500
commit1f95e80351cdb45de0994a0a3aba277267d41ad0 (patch)
tree6e97361353b913618e71441400b34cb560a2679e /src/feature/nodelist/networkstatus.c
parentd4f558e385fd9e3f757278653d22290c3816c39e (diff)
parenta2f81b644b2a4679c634744d3830cdb6397f0814 (diff)
downloadtor-1f95e80351cdb45de0994a0a3aba277267d41ad0.tar.gz
tor-1f95e80351cdb45de0994a0a3aba277267d41ad0.zip
Merge branch 'prop293_squashed'
Diffstat (limited to 'src/feature/nodelist/networkstatus.c')
-rw-r--r--src/feature/nodelist/networkstatus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c
index 5e62903d48..ed01576242 100644
--- a/src/feature/nodelist/networkstatus.c
+++ b/src/feature/nodelist/networkstatus.c
@@ -724,8 +724,8 @@ networkstatus_vote_find_mutable_entry(networkstatus_t *ns, const char *digest)
/** Return the entry in <b>ns</b> for the identity digest <b>digest</b>, or
* NULL if none was found. */
-const routerstatus_t *
-networkstatus_vote_find_entry(networkstatus_t *ns, const char *digest)
+MOCK_IMPL(const routerstatus_t *,
+networkstatus_vote_find_entry,(networkstatus_t *ns, const char *digest))
{
return networkstatus_vote_find_mutable_entry(ns, digest);
}