]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
ATTR_NORETURN is needed on lost_owning_controller now
authorNick Mathewson <nickm@torproject.org>
Mon, 3 Mar 2014 15:54:20 +0000 (10:54 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 3 Mar 2014 15:54:20 +0000 (10:54 -0500)
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

index 05ff9a659235ab239836b392ffe977a604b229e6..1da99699281914cc946dc7641ba865200759e3a8 100644 (file)
@@ -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