vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

openssl: change `read_into` to `read` (#12251)

pull/12255/head
a-iga 2021-10-21 20:13:04 +09:00 committed by GitHub
parent a84b1a53ec
commit 1ba839dc3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/net/openssl/ssl_connection.v
View File

@ -179,7 +179,13 @@ pub fn (mut s SSLConn) socket_read_into_ptr(buf_ptr &byte, len int) ?int {
return res return res
} }
[deprecated: 'call SSLConn.read instead']
[deprecated_after: '2021-11-04']
pub fn (mut s SSLConn) read_into(mut buffer []byte) ?int { pub fn (mut s SSLConn) read_into(mut buffer []byte) ?int {
return s.read(mut buffer)
}
pub fn (mut s SSLConn) read(mut buffer []byte) ?int {
res := s.socket_read_into_ptr(&byte(buffer.data), buffer.len) ? res := s.socket_read_into_ptr(&byte(buffer.data), buffer.len) ?
return res return res
} }

2
vlib/net/websocket/io.v
View File

@ -10,7 +10,7 @@ fn (mut ws Client) socket_read(mut buffer []byte) ?int {
return error('socket_read: trying to read a closed socket') return error('socket_read: trying to read a closed socket')
} }
if ws.is_ssl { if ws.is_ssl {
r := ws.ssl_conn.read_into(mut buffer) ? r := ws.ssl_conn.read(mut buffer) ?
return r return r
} else { } else {
for { for {