From c9ddd6c1bf2291ab5ae83ccc6e71fb5dae3440a6 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Thu, 9 Mar 2023 14:26:16 -0500 Subject: [PATCH] MT#55283 eliminate useless return values These functions now cannot fail and so returning a value is pointless. Change-Id: I062449f30f05fb3efa4ba520004a13de3a0abd5a (cherry picked from commit 26cc168f833c0cc4460593407d410f1d81497706) --- daemon/websocket.c | 35 +++++++++++++++++------------------ include/websocket.h | 10 +++++----- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/daemon/websocket.c b/daemon/websocket.c index a3b6ba8af..a965d2ea3 100644 --- a/daemon/websocket.c +++ b/daemon/websocket.c @@ -124,7 +124,7 @@ size_t websocket_queue_len(struct websocket_conn *wc) { // adds data to output buffer (can be null) and optionally triggers specified response -int websocket_write_raw(struct websocket_conn *wc, const char *msg, size_t len, +void websocket_write_raw(struct websocket_conn *wc, const char *msg, size_t len, enum lws_write_protocol protocol, int done) { mutex_lock(&wc->lock); @@ -139,23 +139,21 @@ int websocket_write_raw(struct websocket_conn *wc, const char *msg, size_t len, } mutex_unlock(&wc->lock); - - return 0; } // adds data to output buffer (can be null) and triggers specified response: http or binary websocket -int websocket_write_http_len(struct websocket_conn *wc, const char *msg, size_t len, int done) { - return websocket_write_raw(wc, msg, len, LWS_WRITE_HTTP, done); +void websocket_write_http_len(struct websocket_conn *wc, const char *msg, size_t len, int done) { + websocket_write_raw(wc, msg, len, LWS_WRITE_HTTP, done); } -int websocket_write_http(struct websocket_conn *wc, const char *msg, int done) { - return websocket_write_http_len(wc, msg, msg ? strlen(msg) : 0, done); +void websocket_write_http(struct websocket_conn *wc, const char *msg, int done) { + websocket_write_http_len(wc, msg, msg ? strlen(msg) : 0, done); } -int websocket_write_text(struct websocket_conn *wc, const char *msg, int done) { - return websocket_write_raw(wc, msg, strlen(msg), LWS_WRITE_TEXT, done); +void websocket_write_text(struct websocket_conn *wc, const char *msg, int done) { + websocket_write_raw(wc, msg, strlen(msg), LWS_WRITE_TEXT, done); } -int websocket_write_binary(struct websocket_conn *wc, const char *msg, size_t len, int done) { - return websocket_write_raw(wc, msg, len, LWS_WRITE_BINARY, done); +void websocket_write_binary(struct websocket_conn *wc, const char *msg, size_t len, int done) { + websocket_write_raw(wc, msg, len, LWS_WRITE_BINARY, done); } @@ -317,19 +315,18 @@ void websocket_http_response(struct websocket_conn *wc, int status, const char * mutex_unlock(&wc->lock); } -const char *websocket_http_complete(struct websocket_conn *wc, int status, const char *content_type, +void websocket_http_complete(struct websocket_conn *wc, int status, const char *content_type, ssize_t content_length, const char *content) { websocket_http_response(wc, status, content_type, content_length); - if (websocket_write_http(wc, content, 1)) - return "Failed to write pong response"; - return NULL; + websocket_write_http(wc, content, 1); } static const char *websocket_http_ping(struct websocket_message *wm) { ilogs(http, LOG_DEBUG, "Respoding to GET /ping"); - return websocket_http_complete(wm->wc, 200, "text/plain", 5, "pong\n"); + websocket_http_complete(wm->wc, 200, "text/plain", 5, "pong\n"); + return NULL; } @@ -366,7 +363,8 @@ static const char *websocket_http_metrics(struct websocket_message *wm) { g_string_append_printf(outp, " %s\n", m->value_short); } - return websocket_http_complete(wm->wc, 200, "text/plain", outp->len, outp->str); + websocket_http_complete(wm->wc, 200, "text/plain", outp->len, outp->str); + return NULL; } @@ -398,7 +396,8 @@ static const char *websocket_http_cli(struct websocket_message *wm) { size_t len = websocket_queue_len(wm->wc); - return websocket_http_complete(wm->wc, 200, "text/plain", len, NULL); + websocket_http_complete(wm->wc, 200, "text/plain", len, NULL); + return NULL; } diff --git a/include/websocket.h b/include/websocket.h index d627dc9d1..7c22b7baa 100644 --- a/include/websocket.h +++ b/include/websocket.h @@ -37,13 +37,13 @@ void websocket_start(void); // appends to output buffer without triggering a response void websocket_queue_raw(struct websocket_conn *wc, const char *msg, size_t len); // adds data to output buffer (can be null) and optionally triggers specified response -int websocket_write_raw(struct websocket_conn *wc, const char *msg, size_t len, +void websocket_write_raw(struct websocket_conn *wc, const char *msg, size_t len, enum lws_write_protocol protocol, int done); // adds data to output buffer (can be null) and triggers specified response: http or binary websocket -int websocket_write_http_len(struct websocket_conn *wc, const char *msg, size_t len, int done); -int websocket_write_http(struct websocket_conn *wc, const char *msg, int done); -int websocket_write_text(struct websocket_conn *wc, const char *msg, int done); -int websocket_write_binary(struct websocket_conn *wc, const char *msg, size_t len, int done); +void websocket_write_http_len(struct websocket_conn *wc, const char *msg, size_t len, int done); +void websocket_write_http(struct websocket_conn *wc, const char *msg, int done); +void websocket_write_text(struct websocket_conn *wc, const char *msg, int done); +void websocket_write_binary(struct websocket_conn *wc, const char *msg, size_t len, int done); // num bytes in output buffer size_t websocket_queue_len(struct websocket_conn *wc);