[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Nbd] [PATCH 4/5] nbd-server: remove superfluous 2nd parameter from handle_oldstyle_connection()



A pointer to the server struct is passed anyways, the socket can be
accessed via that pointer.

Signed-off-by: Tuomas Räsänen <tuomasjjrasanen@...1261...>
---
 nbd-server.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nbd-server.c b/nbd-server.c
index b2134c4..d7d9c62 100644
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -2354,14 +2354,14 @@ handler_err:
 }
 
 static void
-handle_oldstyle_connection(GArray *servers, int sock, SERVER *serve)
+handle_oldstyle_connection(GArray *servers, SERVER *serve)
 {
 	int net;
 	CLIENT *client = NULL;
 	int sock_flags_old;
 	int sock_flags_new;
 
-	net = socket_accept(sock);
+	net = socket_accept(serve->socket);
 	if (net < 0)
 		return;
 
@@ -2602,7 +2602,7 @@ void serveloop(GArray* servers) {
 					continue;
 				}
 				if(FD_ISSET(serve->socket, &rset)) {
-					handle_oldstyle_connection(servers, serve->socket, serve);
+					handle_oldstyle_connection(servers, serve);
 				}
 			}
 		}
-- 
1.7.10.4




Reply to: