diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-03 10:54:20 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-03 10:54:20 -0500 |
| commit | 0db39eb89fe7b1a16c0357fbeef440f03e0c95ac (patch) | |
| tree | d9cf9b4b28c0fcad3ed9bd2cd592947f65a66e9a /src/or | |
| parent | d98f743b282a8b28ed8d2d14db3bbfee40c5e6b0 (diff) | |
| download | tor-0db39eb89fe7b1a16c0357fbeef440f03e0c95ac.tar tor-0db39eb89fe7b1a16c0357fbeef440f03e0c95ac.tar.gz | |
ATTR_NORETURN is needed on lost_owning_controller now
This should fixes some "hey, that function could have
__attribute__((noreturn))" warnings introduced by f96400d9.
Bug not in any released version of Tor.
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/control.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c index 05ff9a659..1da996992 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3176,6 +3176,10 @@ connection_control_reached_eof(control_connection_t *conn) return 0; } +static void lost_owning_controller(const char *owner_type, + const char *loss_manner) + ATTR_NORETURN; + /** Shut down this Tor instance in the same way that SIGINT would, but * with a log message appropriate for the loss of an owning controller. */ static void @@ -4670,6 +4674,8 @@ static char *owning_controller_process_spec = NULL; * if this Tor instance is not currently owned by a process. */ static tor_process_monitor_t *owning_controller_process_monitor = NULL; +static void owning_controller_procmon_cb(void *unused) ATTR_NORETURN; + /** Process-termination monitor callback for Tor's owning controller * process. */ static void |