res/res_http_websocket: Fix minor nits found by wdoekes on r409681

When Moises committed the fixes for WSS (which was a great patch), wdoekes had
a few style nits that were on the review that got missed. This patch resolves
what I *think* were all of the ones that were still on the review.

Thanks to both moy for the patch, and wdoekes for the reviews.

Review: https://reviewboard.asterisk.org/r/3248/

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@426209 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c
index c72c8da3270608fb081597ba54f6d6a41b5e1b37..5258a5f556b3759237cb681e6f3760112e30fbaf 100644 (file)
--- a/res/res_http_websocket.c
+++ b/res/res_http_websocket.c
@@ -364,27 +364,27 @@ static inline int ws_safe_read(struct ast_websocket *session, char *buf, int len
        for (sanity = 10; sanity; sanity--) {
                clearerr(session->f);
                rlen = fread(rbuf, 1, xlen, session->f);
-               if (0 == rlen && ferror(session->f) && errno != EAGAIN) {
+               if (!rlen && ferror(session->f) && errno != EAGAIN) {
                        ast_log(LOG_ERROR, "Error reading from web socket: %s\n", strerror(errno));
-                       (*opcode) = AST_WEBSOCKET_OPCODE_CLOSE;
+                       *opcode = AST_WEBSOCKET_OPCODE_CLOSE;
                        session->closing = 1;
                        return -1;
                }
-               xlen = (xlen - rlen);
+               xlen = xlen - rlen;
                rbuf = rbuf + rlen;
-               if (0 == xlen) {
+               if (!xlen) {
                        break;
                }
                if (ast_wait_for_input(session->fd, 1000) < 0) {
                        ast_log(LOG_ERROR, "ast_wait_for_input returned err: %s\n", strerror(errno));
-                       (*opcode) = AST_WEBSOCKET_OPCODE_CLOSE;
+                       *opcode = AST_WEBSOCKET_OPCODE_CLOSE;
                        session->closing = 1;
                        return -1;
                }
        }
        if (!sanity) {
                ast_log(LOG_WARNING, "Websocket seems unresponsive, disconnecting ...\n");
-               (*opcode) = AST_WEBSOCKET_OPCODE_CLOSE;
+               *opcode = AST_WEBSOCKET_OPCODE_CLOSE;
                session->closing = 1;
                return -1;
        }
@@ -450,7 +450,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_read)(struct ast_websocket *session, cha
                        return -1;
                }
 
-               if (ws_safe_read(session, (*payload), (*payload_len), opcode)) {
+               if (ws_safe_read(session, *payload, *payload_len, opcode)) {
                        return 0;
                }
 
@@ -735,7 +735,7 @@ static void websocket_echo_callback(struct ast_websocket *session, struct ast_va
        }
 
 end:
-       ast_debug(1, "Exitting WebSocket echo loop\n");
+       ast_debug(1, "Exiting WebSocket echo loop\n");
        ast_websocket_unref(session);
 }