aboutsummaryrefslogtreecommitdiff
path: root/src/feature/dircache
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-09-22 09:59:37 -0400
committerNick Mathewson <nickm@torproject.org>2020-09-22 10:07:14 -0400
commit88d99fc1bd87b17517e49fd7ae82c0de6eaff992 (patch)
treec1926f824d1381243d9fcbbe9cbff495427eded0 /src/feature/dircache
parent1cce0588e10b952d6acff8e55365011bdabbefdb (diff)
downloadtor-88d99fc1bd87b17517e49fd7ae82c0de6eaff992.tar.gz
tor-88d99fc1bd87b17517e49fd7ae82c0de6eaff992.zip
Fix warnings when using two unusual options together.
The option `--enable-all-bugs-are-fatal` when used with `--disable-module-relay` caused GCC to warn about functions that it thought should be labeled noreturn. I've tried a couple of approaches, but disabling the warning on these functions seems to be the best approach. Fixed #40129; bugfix on 0.4.4.1-alpha.
Diffstat (limited to 'src/feature/dircache')
-rw-r--r--src/feature/dircache/dircache_stub.c2
1 files changed, 2 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)