From 53271496540cad2ebe48db5127595280af845ded Mon Sep 17 00:00:00 2001 From: Brett Nicholas <7547222+bigbrett@users.noreply.github.com> Date: Thu, 15 Aug 2024 11:29:39 -0600 Subject: [PATCH] add return values --- posix/tcp/wh_client_tcp/wh_client_tcp.c | 18 ++++++++---------- posix/tcp/wh_server_tcp/wh_server_tcp.c | 18 +++++++++++------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/posix/tcp/wh_client_tcp/wh_client_tcp.c b/posix/tcp/wh_client_tcp/wh_client_tcp.c index 0369cc3..870dbe5 100644 --- a/posix/tcp/wh_client_tcp/wh_client_tcp.c +++ b/posix/tcp/wh_client_tcp/wh_client_tcp.c @@ -16,7 +16,7 @@ #include "wh_demo_client_all.h" /** Local declarations */ -static void* wh_ClientTask(void* cf); +static int wh_ClientTask(void* cf); enum { @@ -30,7 +30,7 @@ enum { #define WH_SERVER_TCP_PORT 23456 #define WH_CLIENT_ID 12 -static void* wh_ClientTask(void* cf) +static int wh_ClientTask(void* cf) { whClientConfig* config = (whClientConfig*)cf; int ret = 0; @@ -44,7 +44,7 @@ static void* wh_ClientTask(void* cf) uint16_t rx_resp_len = 0; if (config == NULL) { - return NULL; + return -1; } ret = wh_Client_Init(client, config); @@ -52,7 +52,7 @@ static void* wh_ClientTask(void* cf) if (ret != 0) { perror("Init error:"); - return NULL; + return -1; } for(counter = 0; counter < REPEAT_COUNT; counter++) { @@ -96,10 +96,10 @@ static void* wh_ClientTask(void* cf) } - wh_Client_CommClose(client); - ret = wh_Client_Cleanup(client); + (void)wh_Client_CommClose(client); + (void)wh_Client_Cleanup(client); printf("Client disconnected\n"); - return NULL; + return ret; } int main(int argc, char** argv) @@ -124,7 +124,5 @@ int main(int argc, char** argv) .comm = cc_conf, }}; - wh_ClientTask(c_conf); - - return 0; + return wh_ClientTask(c_conf); } diff --git a/posix/tcp/wh_server_tcp/wh_server_tcp.c b/posix/tcp/wh_server_tcp/wh_server_tcp.c index 3aad723..4ffee63 100644 --- a/posix/tcp/wh_server_tcp/wh_server_tcp.c +++ b/posix/tcp/wh_server_tcp/wh_server_tcp.c @@ -17,7 +17,7 @@ #include "port/posix/posix_transport_tcp.h" /** Local declarations */ -static void* wh_ServerTask(void* cf); +static int wh_ServerTask(void* cf); enum { ONE_MS = 1000, @@ -28,7 +28,7 @@ enum { #define WH_SERVER_TCP_PORT 23456 #define WH_SERVER_ID 56 -static void* wh_ServerTask(void* cf) +static int wh_ServerTask(void* cf) { whServerContext server[1]; whServerConfig* config = (whServerConfig*)cf; @@ -37,7 +37,7 @@ static void* wh_ServerTask(void* cf) whCommConnected am_connected = WH_COMM_CONNECTED; if (config == NULL) { - return NULL; + return -1; } ret = wh_Server_Init(server, config); @@ -61,10 +61,14 @@ static void* wh_ServerTask(void* cf) } wh_Server_GetConnected(server, &am_connected); } - ret = wh_Server_Cleanup(server); + if (ret != 0) { + (void)wh_Server_Cleanup(server); + } else { + ret = wh_Server_Cleanup(server); + } printf("Server disconnected\n"); } - return NULL; + return ret; } int main(int argc, char** argv) @@ -140,7 +144,7 @@ int main(int argc, char** argv) return rc; } - wh_ServerTask(s_conf); + rc = wh_ServerTask(s_conf); - return 0; + return rc; }