[tor-commits] [tor/master] ATTR_NORETURN is needed on lost_owning_controller now

[nickm at torproject.org]

commit 0db39eb89fe7b1a16c0357fbeef440f03e0c95ac
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 3 10:54:20 2014 -0500

    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.
---
 src/or/control.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/or/control.c b/src/or/control.c
index 05ff9a6..1da9969 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