diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-05-14 13:07:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-05-14 13:07:27 -0400 |
| commit | d8de831932cefe2fe7196609b855892ee7188b4b (patch) | |
| tree | e8308b1906ad015174bcda7bdf299a7f23d5a878 /src | |
| parent | 43e15300bad6dd2618f331d51a1b3f83c2326d4e (diff) | |
| download | tor-d8de831932cefe2fe7196609b855892ee7188b4b.tar.gz tor-d8de831932cefe2fe7196609b855892ee7188b4b.zip | |
MSVC build issue: it can't tell that tor_assert(0) aborts.
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/connection.c | 3 | ||||
| -rw-r--r-- | src/or/networkstatus.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index d379533494..0c970cc3b4 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -778,7 +778,8 @@ create_unix_sockaddr(const char *listenaddress, char **readable_address, "Unix domain sockets not supported, yet we tried to create one."); *len_out = 0; tor_assert(0); -}; + return NULL; +} #endif /* HAVE_SYS_UN_H */ /** Warn that an accept or a connect has failed because we're running up diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 910b99c5c0..3646ee6844 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1463,8 +1463,10 @@ networkstatus_get_latest_consensus_by_flavor(consensus_flavor_t f) return current_ns_consensus; else if (f == FLAV_MICRODESC) return current_md_consensus; - else + else { tor_assert(0); + return NULL; + } } /** Return the most recent consensus that we have downloaded, or NULL if it is |