diff options
| author | George Kadianakis <desnacked@riseup.net> | 2020-10-07 13:32:17 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2020-10-07 13:32:17 +0300 |
| commit | a914ac5d7c79170bfc766ffe2b2a30c9d99996bb (patch) | |
| tree | 4cbdef00e30190e24b4b59d8537ba81d7ba60a7d /src | |
| parent | 149b7a2418b436bee1be8059e7ccac3d4e5a401a (diff) | |
| parent | 88d99fc1bd87b17517e49fd7ae82c0de6eaff992 (diff) | |
| download | tor-a914ac5d7c79170bfc766ffe2b2a30c9d99996bb.tar.gz tor-a914ac5d7c79170bfc766ffe2b2a30c9d99996bb.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/154' into maint-0.4.4
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 34d8163c36..75a3d2f35c 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2488,6 +2488,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 @@ -2517,6 +2521,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 as defined by the Address configuration * has changed. This is for routers that get their address from a service |