From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 14 Sep 2021 19:34:40 +0000 (-0400)
Subject: rename for consistency
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=461dcb0ec4df3a395b039630670009a53bf92f68;p=thirdparty%2Ffreeradius-server.git

rename for consistency
---

diff --git a/src/lib/io/network.c b/src/lib/io/network.c
index c2995b48636..399be085818 100644
--- a/src/lib/io/network.c
+++ b/src/lib/io/network.c
@@ -240,7 +240,7 @@ int fr_network_listen_add(fr_network_t *nr, fr_listen_t *li)
  * @param nr		the network
  * @param li		the listener
  */
-int fr_network_socket_delete(fr_network_t *nr, fr_listen_t *li)
+int fr_network_listen_delete(fr_network_t *nr, fr_listen_t *li)
 {
 	fr_network_socket_t *s;
 
diff --git a/src/lib/io/network.h b/src/lib/io/network.h
index 3599488f12b..bc91a969b8f 100644
--- a/src/lib/io/network.h
+++ b/src/lib/io/network.h
@@ -48,7 +48,7 @@ typedef struct {
 
 int		fr_network_listen_add(fr_network_t *nr, fr_listen_t *li) CC_HINT(nonnull);
 
-int		fr_network_socket_delete(fr_network_t *nr, fr_listen_t *li);
+int		fr_network_listen_delete(fr_network_t *nr, fr_listen_t *li) CC_HINT(nonnull);
 
 int		fr_network_directory_add(fr_network_t *nr, fr_listen_t *li) CC_HINT(nonnull);
 
diff --git a/src/listen/detail/proto_detail_file.c b/src/listen/detail/proto_detail_file.c
index 660c51eb261..1505eba0f71 100644
--- a/src/listen/detail/proto_detail_file.c
+++ b/src/listen/detail/proto_detail_file.c
@@ -706,7 +706,7 @@ static int mod_close(fr_listen_t *li)
 	proto_detail_file_t const  *inst = talloc_get_type_abort_const(li->app_io_instance, proto_detail_file_t);
 	proto_detail_file_thread_t *thread = talloc_get_type_abort(li->thread_instance, proto_detail_file_thread_t);
 
-	if (thread->nr) (void) fr_network_socket_delete(thread->nr, inst->parent->listen);
+	if (thread->nr) (void) fr_network_listen_delete(thread->nr, inst->parent->listen);
 
 	/*
 	 *	@todo - have our OWN event loop for timers, and a
@@ -717,7 +717,7 @@ static int mod_close(fr_listen_t *li)
 
 	if (thread->vnode_fd >= 0) {
 		if (thread->nr) {
-			(void) fr_network_socket_delete(thread->nr, inst->parent->listen);
+			(void) fr_network_listen_delete(thread->nr, inst->parent->listen);
 		} else {
 			if (fr_event_fd_delete(thread->el, thread->vnode_fd, FR_EVENT_FILTER_VNODE) < 0) {
 				PERROR("Failed removing DELETE callback on detach");