From 3662b663bcfc9477e511ddeb1456f054f0f58054 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Sat, 19 Jan 2013 11:52:06 +0800 Subject: [PATCH] change bitfield setting to avoid gcc warnings Signed-off-by: Andy Green --- lib/client-parser.c | 4 +--- lib/parsers.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/client-parser.c b/lib/client-parser.c index 1367c6f6..84c65698 100644 --- a/lib/client-parser.c +++ b/lib/client-parser.c @@ -141,10 +141,8 @@ int libwebsocket_client_rx_sm(struct libwebsocket *wsi, unsigned char c) wsi->final = !!((c >> 7) & 1); switch (wsi->opcode) { case LWS_WS_OPCODE_07__TEXT_FRAME: - wsi->frame_is_binary = 0; - break; case LWS_WS_OPCODE_07__BINARY_FRAME: - wsi->frame_is_binary = 1; + wsi->frame_is_binary = wsi->opcode == LWS_WS_OPCODE_07__BINARY_FRAME; break; } wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN; diff --git a/lib/parsers.c b/lib/parsers.c index 062cc37c..51684711 100644 --- a/lib/parsers.c +++ b/lib/parsers.c @@ -794,10 +794,8 @@ handle_first: wsi->final = !!((c >> 7) & 1); switch (wsi->opcode) { case LWS_WS_OPCODE_07__TEXT_FRAME: - wsi->frame_is_binary = 0; - break; case LWS_WS_OPCODE_07__BINARY_FRAME: - wsi->frame_is_binary = 1; + wsi->frame_is_binary = wsi->opcode == LWS_WS_OPCODE_07__BINARY_FRAME; break; } wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN;