From fde0026d3ee924451ae30ab8d3c116d630091b23 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Wed, 23 Aug 2023 19:24:09 -0400
Subject: [PATCH] Rename SDLNet_WaitForServerIncoming to
SDLNet_WaitForClientConnection.
---
SDL_net.c | 4 ++--
SDL_net.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/SDL_net.c b/SDL_net.c
index 6fd565a..9e43f54 100644
--- a/SDL_net.c
+++ b/SDL_net.c
@@ -697,7 +697,7 @@ SDLNet_Server *SDLNet_CreateServer(SDLNet_Address *addr, Uint16 port)
return server;
}
-int SDLNet_WaitForServerIncoming(SDLNet_Server *server)
+int SDLNet_WaitForClientConnection(SDLNet_Server *server)
{
if (!server) {
return SDL_InvalidParamError("server");
@@ -1351,7 +1351,7 @@ int main(int argc, char **argv)
SDLNet_StreamSocket *stream;
if (argc > 1) {
SDLNet_Server *server = SDLNet_CreateServer(NULL, 7997);
- SDLNet_WaitForServerIncoming(server);
+ SDLNet_WaitForClientConnection(server);
SDLNet_AcceptClient(server, &stream);
} else {
SDLNet_Address *addr = SDLNet_ResolveHostname("localhost");
diff --git a/SDL_net.h b/SDL_net.h
index 8cba1a3..dfa4c5f 100644
--- a/SDL_net.h
+++ b/SDL_net.h
@@ -47,7 +47,7 @@ extern DECLSPEC int SDLCALL SDLNet_WaitForConnection(SDLNet_StreamSocket *sock);
/* Servers listen for and accept connections from clients, and then send/receive data on a stream socket. */
typedef struct SDLNet_Server SDLNet_Server; /* a listen socket internally. Binds to a port, accepts connections. */
extern DECLSPEC SDLNet_Server * SDLCALL SDLNet_CreateServer(SDLNet_Address *addr, Uint16 port); /* Specify NULL for any/all interfaces, or something from GetLocalAddresses */
-extern DECLSPEC int SDLCALL SDLNet_WaitForServerIncoming(SDLNet_Server *server); /* blocks until a client is ready for to be accepted or there's a serious error. Optional. */
+extern DECLSPEC int SDLCALL SDLNet_WaitForClientConnection(SDLNet_Server *server); /* blocks until a client is ready for to be accepted or there's a serious error. Optional. */
extern DECLSPEC int SDLCALL SDLNet_AcceptClient(SDLNet_Server *server, SDLNet_StreamSocket **client_stream); /* Accept pending connection. Does not block, returns 0 and sets *client_stream=NULL if none available. -1 on errors, zero otherwise. */
extern DECLSPEC void SDLCALL SDLNet_DestroyServer(SDLNet_Server *server);