change bitfield setting to avoid gcc warnings 37/2937/1
authorAndy Green <andy.green@linaro.org>
Sat, 19 Jan 2013 03:52:06 +0000 (11:52 +0800)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Thu, 7 Mar 2013 21:01:27 +0000 (13:01 -0800)
Signed-off-by: Andy Green <andy.green@linaro.org>
lib/client-parser.c
lib/parsers.c

index 1367c6f..84c6569 100644 (file)
@@ -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;
index 062cc37..5168471 100644 (file)
@@ -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;