From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 19 Sep 2018 14:15:10 +0000 (-0400)
Subject: sc can't be NULL
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfca92512e2ccf916e7012c9ae76ad1e7912ff08;p=thirdparty%2Ffreeradius-server.git

sc can't be NULL
---

diff --git a/src/lib/io/master.c b/src/lib/io/master.c
index e225781d262..3bfc540d4ef 100644
--- a/src/lib/io/master.c
+++ b/src/lib/io/master.c
@@ -2645,11 +2645,6 @@ int fr_master_io_listen(TALLOC_CTX *ctx, fr_io_instance_t *io, fr_schedule_t *sc
 		return -1;
 	}
 
-	/*
-	 *	The caller may need to add his own socket to the scheduler.
-	 */
-	if (!sc) return 0;
-
 	/*
 	 *	Add the socket to the scheduler, which might
 	 *	end up in a different thread.
diff --git a/src/lib/io/master.h b/src/lib/io/master.h
index 63c3107a8cb..fc45000d565 100644
--- a/src/lib/io/master.h
+++ b/src/lib/io/master.h
@@ -124,7 +124,7 @@ extern fr_app_io_t fr_master_app_io;
 
 fr_trie_t *fr_master_io_network(TALLOC_CTX *ctx, int af, fr_ipaddr_t *allow, fr_ipaddr_t *deny);
 int fr_master_io_listen(TALLOC_CTX *ctx, fr_io_instance_t *io, fr_schedule_t *sc,
-			size_t default_message_size, size_t num_messages);
+			size_t default_message_size, size_t num_messages) CC_HINT(nonnull);
 
 #ifdef __cplusplus
 }