From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Mar 2014 15:54:20 +0000 (-0500)
Subject: ATTR_NORETURN is needed on lost_owning_controller now
X-Git-Tag: tor-0.2.5.3-alpha~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0db39eb89fe7b1a16c0357fbeef440f03e0c95ac;p=thirdparty%2Ftor.git

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.
---

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