[svn-commits] mjordan: trunk r426212 - in /trunk: ./ res/res_http_websocket.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Sun Oct 26 21:47:03 2014
New Revision: 426212

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=426212
Log:
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/
........

Merged revisions 426209 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 426210 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 426211 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/res/res_http_websocket.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/res/res_http_websocket.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_http_websocket.c?view=diff&rev=426212&r1=426211&r2=426212
==============================================================================
--- trunk/res/res_http_websocket.c (original)
+++ trunk/res/res_http_websocket.c Sun Oct 26 21:47:03 2014
@@ -416,27 +416,27 @@
 	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;
 	}
@@ -502,7 +502,7 @@
 			return -1;
 		}
 
-		if (ws_safe_read(session, (*payload), (*payload_len), opcode)) {
+		if (ws_safe_read(session, *payload, *payload_len, opcode)) {
 			return 0;
 		}
 		/* If a mask is present unmask the payload */
@@ -839,7 +839,7 @@
 	}
 
 end:
-	ast_debug(1, "Exitting WebSocket echo loop\n");
+	ast_debug(1, "Exiting WebSocket echo loop\n");
 	ast_websocket_unref(session);
 }