nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.4' into master

Browse Source
This commit is contained in:
George Kadianakis 2020-10-07 13:42:57 +03:00
commit 438aba6c0b
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug40129 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (compilation):
- Fix compiler warnings that would occur when building with
"--enable-all-bugs-are-fatal" and "--disable-module-relay"
at the same time. Fixes bug 40129; bugfix on 0.4.4.1-alpha.

2
src/feature/dircache/dircache_stub.c
View File

@ -14,6 +14,7 @@
#include "feature/dircache/dirserv.h" #include "feature/dircache/dirserv.h"
#include "feature/dircommon/dir_connection_st.h" #include "feature/dircommon/dir_connection_st.h"
DISABLE_GCC_WARNING("-Wmissing-noreturn")
int int
directory_handle_command(dir_connection_t *conn) directory_handle_command(dir_connection_t *conn)
{ {
@ -29,6 +30,7 @@ connection_dirserv_flushed_some(dir_connection_t *conn)
tor_assert_nonfatal_unreached_once(); tor_assert_nonfatal_unreached_once();
return -1; return -1;
} }
ENABLE_GCC_WARNING("-Wmissing-noreturn")
void void
dir_conn_clear_spool(dir_connection_t *conn) dir_conn_clear_spool(dir_connection_t *conn)

5
src/feature/relay/router.c
View File

@ -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 /** Note at log level severity that our best guess of address has changed from
* <b>prev</b> to <b>cur</b>. */ * <b>prev</b> to <b>cur</b>. */
void void
@ -2636,6 +2640,7 @@ log_addr_has_changed(int severity,
"Guessed our IP address as %s (source: %s).", "Guessed our IP address as %s (source: %s).",
addrbuf_cur, source); addrbuf_cur, source);
} }
ENABLE_GCC_WARNING("-Wmissing-noreturn")
/** Check whether our own address has changed versus the one we have in our /** Check whether our own address has changed versus the one we have in our
* current descriptor. * current descriptor.