From 42dad5df9584e83b22d3eeb6e6f158e7125040fa Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 20 Feb 2020 13:46:33 +0100 Subject: [rnet] Renamed some functions --- examples/network/network_ping_pong.c | 6 +++--- examples/network/network_resolve_host.c | 2 +- examples/network/network_tcp_client.c | 4 ++-- examples/network/network_tcp_server.c | 4 ++-- examples/network/network_test.c | 16 ++++++++-------- examples/network/network_udp_client.c | 4 ++-- examples/network/network_udp_server.c | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) (limited to 'examples') diff --git a/examples/network/network_ping_pong.c b/examples/network/network_ping_pong.c index a56cafe8..22aaa69e 100644 --- a/examples/network/network_ping_pong.c +++ b/examples/network/network_ping_pong.c @@ -131,7 +131,7 @@ int main(void) InitNetworkDevice(); // Init network communications // Create the server: getaddrinfo + socket + setsockopt + bind + listen - serverResult = AllocSocketResult(); + serverResult = LoadSocketResult(); if (!SocketCreate(&serverConfig, serverResult)) { TraceLog(LOG_WARNING, "Failed to open server: status %d, errno %d", serverResult->status, serverResult->socket->status); @@ -155,7 +155,7 @@ int main(void) } // Create the client: getaddrinfo + socket + setsockopt + connect (TCP only) - clientResult = AllocSocketResult(); + clientResult = LoadSocketResult(); if (!SocketCreate(&clientConfig, clientResult)) { TraceLog(LOG_WARNING, "Failed to open client: status %d, errno %d", clientResult->status, clientResult->socket->status); @@ -172,7 +172,7 @@ int main(void) } // Create and add sockets to the socket set - socketSet = AllocSocketSet(3); + socketSet = LoadSocketSet(3); AddSocket(socketSet, serverResult->socket); AddSocket(socketSet, clientResult->socket); diff --git a/examples/network/network_resolve_host.c b/examples/network/network_resolve_host.c index c06f1e35..e2e3f721 100644 --- a/examples/network/network_resolve_host.c +++ b/examples/network/network_resolve_host.c @@ -28,7 +28,7 @@ int main(void) char buffer[ADDRESS_IPV6_ADDRSTRLEN]; unsigned short port = 0; - AddressInformation *address = AllocAddressList(1); + AddressInformation *address = LoadAddressList(1); // Address info flags // ADDRESS_INFO_NUMERICHOST // or try them in conjunction to diff --git a/examples/network/network_tcp_client.c b/examples/network/network_tcp_client.c index 91b57156..4259e25d 100644 --- a/examples/network/network_tcp_client.c +++ b/examples/network/network_tcp_client.c @@ -46,7 +46,7 @@ int main(void) char receiveBuffer[512] = { 0 }; // Create the client: getaddrinfo + socket + setsockopt + connect (TCP only) - clientResult = AllocSocketResult(); + clientResult = LoadSocketResult(); if (!SocketCreate(&clientConfig, clientResult)) TraceLog(LOG_WARNING, "Failed to open client: status %d, errno %d", clientResult->status, clientResult->socket->status); else { @@ -57,7 +57,7 @@ int main(void) } // Create and add sockets to the socket set - socketSet = AllocSocketSet(1); + socketSet = LoadSocketSet(1); AddSocket(socketSet, clientResult->socket); SetTargetFPS(60); // Set our game to run at 60 frames-per-second diff --git a/examples/network/network_tcp_server.c b/examples/network/network_tcp_server.c index e47e12cf..ee64acfc 100644 --- a/examples/network/network_tcp_server.c +++ b/examples/network/network_tcp_server.c @@ -50,7 +50,7 @@ int main(void) char receiveBuffer[512] = { 0 }; // Create the server: getaddrinfo + socket + setsockopt + bind + listen - serverResult = AllocSocketResult(); + serverResult = LoadSocketResult(); if (!SocketCreate(&serverConfig, serverResult)) { TraceLog(LOG_WARNING, "Failed to open server: status %d, errno %d", serverResult->status, serverResult->socket->status); @@ -71,7 +71,7 @@ int main(void) } // Create and add sockets to the socket set - socketSet = AllocSocketSet(2); + socketSet = LoadSocketSet(2); AddSocket(socketSet, serverResult->socket); SetTargetFPS(60); // Set our game to run at 60 frames-per-second diff --git a/examples/network/network_test.c b/examples/network/network_test.c index 2307410e..b756c2cd 100644 --- a/examples/network/network_test.c +++ b/examples/network/network_test.c @@ -23,17 +23,17 @@ void test_network_initialise() void test_socket_result() { - SocketResult *result = AllocSocketResult(); + SocketResult *result = LoadSocketResult(); assert(result != NULL); - FreeSocketResult(&result); + UnloadSocketResult(&result); assert(result == NULL); } void test_socket() { - Socket *socket = AllocSocket(); + Socket *socket = LoadSocket(); assert(socket != NULL); - FreeSocket(&socket); + UnloadSocket(&socket); assert(socket == NULL); } @@ -84,7 +84,7 @@ void test_resolve_host() { const char *address = "localhost"; const char *port = "80"; - AddressInformation *addr = AllocAddressList(3); + AddressInformation *addr = LoadAddressList(3); int count = ResolveHost(address, port, ADDRESS_TYPE_ANY, 0, addr); assert(GetAddressFamily(addr[0]) == ADDRESS_TYPE_IPV6); @@ -105,9 +105,9 @@ void test_address_list() void test_socket_create() { SocketConfig server_cfg = { .host = "127.0.0.1", .port = "8080", .server = true, .nonblocking = true }; - Socket *socket = AllocSocket(); - SocketResult *server_res = AllocSocketResult(); - SocketSet *socket_set = AllocSocketSet(1); + Socket *socket = LoadSocket(); + SocketResult *server_res = LoadSocketResult(); + SocketSet *socket_set = LoadSocketSet(1); assert(SocketCreate(&server_cfg, server_res)); assert(AddSocket(socket_set, server_res->socket)); diff --git a/examples/network/network_udp_client.c b/examples/network/network_udp_client.c index 38a4f0e9..74a241b6 100644 --- a/examples/network/network_udp_client.c +++ b/examples/network/network_udp_client.c @@ -45,14 +45,14 @@ int main(void) char receiveBuffer[512] = { 0 }; // Create the client: getaddrinfo + socket + setsockopt + connect (TCP only) - clientResult = AllocSocketResult(); + clientResult = LoadSocketResult(); if (!SocketCreate(&clientConfig, clientResult)) { TraceLog(LOG_WARNING, "Failed to open client: status %d, errno %d", clientResult->status, clientResult->socket->status); } // Create and add sockets to the socket set - socketSet = AllocSocketSet(1); + socketSet = LoadSocketSet(1); AddSocket(socketSet, clientResult->socket); SetTargetFPS(60); // Set our game to run at 60 frames-per-second diff --git a/examples/network/network_udp_server.c b/examples/network/network_udp_server.c index 6eee2dad..5d5c425e 100644 --- a/examples/network/network_udp_server.c +++ b/examples/network/network_udp_server.c @@ -46,13 +46,13 @@ int main(void) char receiveBuffer[512] = { 0 }; // Create the server: getaddrinfo + socket + setsockopt + bind + listen - serverResult = AllocSocketResult(); + serverResult = LoadSocketResult(); if (!SocketCreate(&serverConfig, serverResult)) TraceLog(LOG_WARNING, "Failed to open server: status %d, errno %d", serverResult->status, serverResult->socket->status); else if (!SocketBind(&serverConfig, serverResult)) TraceLog(LOG_WARNING, "Failed to bind server: status %d, errno %d", serverResult->status, serverResult->socket->status); // Create and add sockets to the socket set - socketSet = AllocSocketSet(1); + socketSet = LoadSocketSet(1); AddSocket(socketSet, serverResult->socket); SetTargetFPS(60); // Set our game to run at 60 frames-per-second -- cgit v1.2.3