diff options
author | George Kadianakis <desnacked@riseup.net> | 2020-10-07 13:42:57 +0300 |
---|---|---|
committer | George Kadianakis <desnacked@riseup.net> | 2020-10-07 13:42:57 +0300 |
commit | 438aba6c0b70c5becc8ba2c17fad98156901f64b (patch) | |
tree | a40abbf7a230c240069cdb369162a4b25755088c /src | |
parent | 84e825598a8845b34ac0dff2a6d797725c174b19 (diff) | |
parent | a914ac5d7c79170bfc766ffe2b2a30c9d99996bb (diff) | |
download | tor-438aba6c0b70c5becc8ba2c17fad98156901f64b.tar.gz tor-438aba6c0b70c5becc8ba2c17fad98156901f64b.zip |
Merge branch 'maint-0.4.4' into master
Diffstat (limited to 'src')
-rw-r--r-- | src/feature/dircache/dircache_stub.c | 2 | ||||
-rw-r--r-- | src/feature/relay/router.c | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/feature/dircache/dircache_stub.c b/src/feature/dircache/dircache_stub.c index 87811597d1..725c44bd4d 100644 --- a/src/feature/dircache/dircache_stub.c +++ b/src/feature/dircache/dircache_stub.c @@ -14,6 +14,7 @@ #include "feature/dircache/dirserv.h" #include "feature/dircommon/dir_connection_st.h" +DISABLE_GCC_WARNING("-Wmissing-noreturn") int directory_handle_command(dir_connection_t *conn) { @@ -29,6 +30,7 @@ connection_dirserv_flushed_some(dir_connection_t *conn) tor_assert_nonfatal_unreached_once(); return -1; } +ENABLE_GCC_WARNING("-Wmissing-noreturn") void dir_conn_clear_spool(dir_connection_t *conn) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 8233ebe47f..5ca21964b6 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2607,6 +2607,10 @@ check_descriptor_bandwidth_changed(time_t now) } } +// This function can be "noreturn" if relay mode is disabled and +// ALL_BUGS_ARE_FATAL is set. +DISABLE_GCC_WARNING("-Wmissing-noreturn") + /** Note at log level severity that our best guess of address has changed from * <b>prev</b> to <b>cur</b>. */ void @@ -2636,6 +2640,7 @@ log_addr_has_changed(int severity, "Guessed our IP address as %s (source: %s).", addrbuf_cur, source); } +ENABLE_GCC_WARNING("-Wmissing-noreturn") /** Check whether our own address has changed versus the one we have in our * current descriptor. |