mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

ci: fix v test-cleancode

Browse Source
This commit is contained in:
Delyan Angelov
2021-01-25 11:26:20 +02:00
parent 94fd3ff431
commit 728344ff65
49 changed files with 353 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vlib/x/websocket/message.v
View File

@@ -223,7 +223,7 @@ pub fn (mut ws Client) parse_frame_header() ?Frame {
buffer[bytes_read] = rbuff[0]
bytes_read++
// parses the first two header bytes to get basic frame information
if bytes_read == u64(header_len_offset) {
if bytes_read == u64(websocket.header_len_offset) {
frame.fin = (buffer[0] & 0x80) == 0x80
frame.rsv1 = (buffer[0] & 0x40) == 0x40
frame.rsv2 = (buffer[0] & 0x20) == 0x20
@@ -234,11 +234,11 @@ pub fn (mut ws Client) parse_frame_header() ?Frame {
// if has mask set the byte postition where mask ends
if frame.has_mask {
mask_end_byte = if frame.payload_len < 126 {
header_len_offset + 4
websocket.header_len_offset + 4
} else if frame.payload_len == 126 {
header_len_offset + 6
websocket.header_len_offset + 6
} else if frame.payload_len == 127 {
header_len_offset + 12
websocket.header_len_offset + 12
} else {
0
} // impossible
@@ -249,7 +249,7 @@ pub fn (mut ws Client) parse_frame_header() ?Frame {
break
}
}
if frame.payload_len == 126 && bytes_read == u64(extended_payload16_end_byte) {
if frame.payload_len == 126 && bytes_read == u64(websocket.extended_payload16_end_byte) {
frame.header_len += 2
frame.payload_len = 0
frame.payload_len |= buffer[2] << 8
@@ -259,7 +259,7 @@ pub fn (mut ws Client) parse_frame_header() ?Frame {
break
}
}
if frame.payload_len == 127 && bytes_read == u64(extended_payload64_end_byte) {
if frame.payload_len == 127 && bytes_read == u64(websocket.extended_payload64_end_byte) {
frame.header_len += 8
// these shift operators needs 64 bit on clang with -prod flag
mut payload_len := u64(0)

2
vlib/x/websocket/websocket_client.v
View File

@@ -360,7 +360,7 @@ fn (mut ws Client) send_control_frame(code OPCode, frame_typ string, payload []b
header_len := if ws.is_server { 2 } else { 6 }
frame_len := header_len + payload.len
mut control_frame := []byte{len: frame_len}
mut masking_key := if !ws.is_server { create_masking_key() } else { empty_bytearr }
mut masking_key := if !ws.is_server { create_masking_key() } else { websocket.empty_bytearr }
defer {
unsafe {
control_frame.free()