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

all: byte => u8

Browse Source
This commit is contained in:
Alexander Medvednikov
2022-04-15 14:58:56 +03:00
parent b49d873217
commit d4a0d6f73c
221 changed files with 1365 additions and 1365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vlib/net/address.v
View File

@@ -10,8 +10,8 @@ union AddrData {
}
const (
addr_ip6_any = [16]byte{init: byte(0)}
addr_ip_any = [4]byte{init: byte(0)}
addr_ip6_any = [16]byte{init: u8(0)}
addr_ip_any = [4]byte{init: u8(0)}
)
fn new_ip6(port u16, addr [16]byte) Addr {

4
vlib/net/address_test.v
View File

@@ -90,7 +90,7 @@ fn test_ip_str() {
assert ip1.len == expected1.len
assert ip1 == expected1
addr := [byte(2), 0, 2, 2]!
addr := [u8(2), 0, 2, 2]!
ip2 := new_ip(2202, addr).str()
expected2 := '2.0.2.2:2202'
assert ip2.len == expected2.len
@@ -103,7 +103,7 @@ fn test_ip6_str() {
assert ip1.len == expected1.len
assert ip1 == expected1
addr := [byte(2), 0, 2, 2, 2, 0, 1, 1, 2, 3, 2, 1, 2, 3, 5, 2]!
addr := [u8(2), 0, 2, 2, 2, 0, 1, 1, 2, 3, 2, 1, 2, 3, 5, 2]!
ip2 := new_ip6(2022, addr).str()
println(ip2)
expected2 := '[200:202:200:101:203:201:203:502]:2022'

16
vlib/net/html/parser.v
View File

@@ -118,7 +118,7 @@ pub fn (mut parser Parser) split_parse(data string) {
else { 0 }
}
if parser.lexical_attributes.open_code { // here will verify all needed to know if open_code finishes and string in code
parser.lexical_attributes.lexeme_builder.write_byte(chr)
parser.lexical_attributes.lexeme_builder.write_u8(chr)
if parser.lexical_attributes.open_string > 0
&& parser.lexical_attributes.open_string == string_code {
parser.lexical_attributes.open_string = 0
@@ -141,12 +141,12 @@ pub fn (mut parser Parser) split_parse(data string) {
parser.lexical_attributes.open_comment = false
parser.lexical_attributes.open_tag = false
} else {
parser.lexical_attributes.lexeme_builder.write_byte(chr)
parser.lexical_attributes.lexeme_builder.write_u8(chr)
}
} else if parser.lexical_attributes.open_string > 0 {
if parser.lexical_attributes.open_string == string_code {
parser.lexical_attributes.open_string = 0
parser.lexical_attributes.lexeme_builder.write_byte(chr)
parser.lexical_attributes.lexeme_builder.write_u8(chr)
temp_lexeme := parser.builder_str()
if parser.lexical_attributes.current_tag.last_attribute != '' {
lattr := parser.lexical_attributes.current_tag.last_attribute
@@ -159,12 +159,12 @@ pub fn (mut parser Parser) split_parse(data string) {
}
parser.lexical_attributes.lexeme_builder.go_back_to(0)
} else {
parser.lexical_attributes.lexeme_builder.write_byte(chr)
parser.lexical_attributes.lexeme_builder.write_u8(chr)
}
} else if parser.lexical_attributes.open_tag {
if parser.lexical_attributes.lexeme_builder.len == 0 && is_quote {
parser.lexical_attributes.open_string = string_code
parser.lexical_attributes.lexeme_builder.write_byte(chr)
parser.lexical_attributes.lexeme_builder.write_u8(chr)
} else if chr == `>` { // close tag >
complete_lexeme := parser.builder_str().to_lower()
parser.lexical_attributes.current_tag.closed = (complete_lexeme.len > 0
@@ -189,8 +189,8 @@ pub fn (mut parser Parser) split_parse(data string) {
parser.lexical_attributes.opened_code_type = parser.lexical_attributes.current_tag.name
}
// parser.print_debug(parser.lexical_attributes.current_tag.name)
} else if chr !in [byte(9), ` `, `=`, `\n`] { // Tab, space, = and \n
parser.lexical_attributes.lexeme_builder.write_byte(chr)
} else if chr !in [u8(9), ` `, `=`, `\n`] { // Tab, space, = and \n
parser.lexical_attributes.lexeme_builder.write_u8(chr)
} else if chr != 10 {
complete_lexeme := parser.builder_str().to_lower()
if parser.lexical_attributes.current_tag.name == '' {
@@ -226,7 +226,7 @@ pub fn (mut parser Parser) split_parse(data string) {
parser.generate_tag()
parser.lexical_attributes.open_tag = true
} else {
parser.lexical_attributes.lexeme_builder.write_byte(chr)
parser.lexical_attributes.lexeme_builder.write_u8(chr)
}
}
}

6
vlib/net/http/cookie.v
View File

@@ -222,11 +222,11 @@ fn sanitize_cookie_path(v string) string {
return sanitize(valid_cookie_path_byte, v)
}
fn valid_cookie_value_byte(b byte) bool {
fn valid_cookie_value_u8(b byte) bool {
return 0x20 <= b && b < 0x7f && b != `"` && b != `;` && b != `\\`
}
fn valid_cookie_path_byte(b byte) bool {
fn valid_cookie_path_u8(b byte) bool {
return 0x20 <= b && b < 0x7f && b != `!`
}
@@ -300,7 +300,7 @@ fn parse_cookie_value(_raw string, allow_double_quote bool) ?string {
raw = raw.substr(1, raw.len - 1)
}
for i in 0 .. raw.len {
if !valid_cookie_value_byte(raw[i]) {
if !valid_cookie_value_u8(raw[i]) {
return error('http.cookie: invalid cookie value')
}
}

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

@@ -180,14 +180,14 @@ pub fn (mut s SSLConn) socket_read_into_ptr(buf_ptr &byte, len int) ?int {
}
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(&u8(buffer.data), buffer.len) ?
return res
}
// write number of bytes to SSL connection
pub fn (mut s SSLConn) write(bytes []byte) ?int {
unsafe {
mut ptr_base := &byte(bytes.data)
mut ptr_base := &u8(bytes.data)
mut total_sent := 0
for total_sent < bytes.len {
ptr := ptr_base + total_sent

4
vlib/net/smtp/smtp.v
View File

@@ -200,9 +200,9 @@ fn (mut c Client) send_auth() ? {
return
}
mut sb := strings.new_builder(100)
sb.write_byte(0)
sb.write_u8(0)
sb.write_string(c.username)
sb.write_byte(0)
sb.write_u8(0)
sb.write_string(c.password)
a := sb.str()
auth := 'AUTH PLAIN ${base64.encode_str(a)}\r\n'

2
vlib/net/tcp.v
View File

@@ -107,7 +107,7 @@ pub fn (mut c TcpConn) write_ptr(b &byte, len int) ?int {
unsafe { b.vstring_with_len(len) })
}
unsafe {
mut ptr_base := &byte(b)
mut ptr_base := &u8(b)
mut total_sent := 0
for total_sent < len {
ptr := ptr_base + total_sent

6
vlib/net/unix/stream_nix.v
View File

@@ -62,7 +62,7 @@ fn (mut s StreamSocket) connect(a string) ? {
}
mut addr := C.sockaddr_un{}
unsafe { C.memset(&addr, 0, sizeof(C.sockaddr_un)) }
addr.sun_family = byte(C.AF_UNIX)
addr.sun_family = u8(C.AF_UNIX)
unsafe { C.strncpy(&addr.sun_path[0], &char(a.str), max_sun_path) }
size := C.SUN_LEN(&addr)
res := C.connect(s.handle, voidptr(&addr), size)
@@ -94,7 +94,7 @@ pub fn listen_stream(sock string) ?&StreamListener {
s.path = sock
mut addr := C.sockaddr_un{}
unsafe { C.memset(&addr, 0, sizeof(C.sockaddr_un)) }
addr.sun_family = byte(C.AF_UNIX)
addr.sun_family = u8(C.AF_UNIX)
unsafe { C.strncpy(&addr.sun_path[0], &char(sock.str), max_sun_path) }
size := C.SUN_LEN(&addr)
if os.exists(sock) {
@@ -177,7 +177,7 @@ pub fn (mut c StreamConn) write_ptr(b &byte, len int) ?int {
unsafe { b.vstring_with_len(len) })
}
unsafe {
mut ptr_base := &byte(b)
mut ptr_base := &u8(b)
mut total_sent := 0
for total_sent < len {
ptr := ptr_base + total_sent

18
vlib/net/urllib/urllib.v
View File

@@ -190,7 +190,7 @@ fn unescape(s_ string, mode EncodingMode) ?string {
if i + 3 >= s.len {
return error(error_msg('unescape: invalid escape sequence', ''))
}
v := ((unhex(s[i + 1]) << byte(4)) | unhex(s[i + 2]))
v := ((unhex(s[i + 1]) << u8(4)) | unhex(s[i + 2]))
if s[i..i + 3] != '%25' && v != ` ` && should_escape(v, .encode_host) {
error(error_msg(urllib.err_msg_escape, s[i..i + 3]))
}
@@ -224,7 +224,7 @@ fn unescape(s_ string, mode EncodingMode) ?string {
if i + 2 >= s.len {
return error(error_msg('unescape: invalid escape sequence', ''))
}
t.write_string(((unhex(s[i + 1]) << byte(4)) | unhex(s[i + 2])).ascii_str())
t.write_string(((unhex(s[i + 1]) << u8(4)) | unhex(s[i + 2])).ascii_str())
i += 2
}
`+` {
@@ -257,7 +257,7 @@ pub fn path_escape(s string) string {
fn escape(s string, mode EncodingMode) string {
mut space_count := 0
mut hex_count := 0
mut c := byte(0)
mut c := u8(0)
for i in 0 .. s.len {
c = s[i]
if should_escape(c, mode) {
@@ -418,7 +418,7 @@ fn get_scheme(rawurl string) ?string {
// sep. If cutc is true then sep is included with the second substring.
// If sep does not occur in s then s and the empty string is returned.
fn split(s string, sep byte, cutc bool) (string, string) {
i := s.index_byte(sep)
i := s.index_u8(sep)
if i < 0 {
return s, ''
}
@@ -462,7 +462,7 @@ fn parse_request_uri(rawurl string) ?URL {
// If via_request is false, all forms of relative URLs are allowed.
[manualfree]
fn parse_url(rawurl string, via_request bool) ?URL {
if string_contains_ctl_byte(rawurl) {
if string_contains_ctl_u8(rawurl) {
return error(error_msg('parse_url: invalid control character in URL', rawurl))
}
if rawurl == '' && via_request {
@@ -746,11 +746,11 @@ pub fn (u URL) str() string {
// it would be mistaken for a scheme name. Such a segment must be
// preceded by a dot-segment (e.g., './this:that') to make a relative-
// path reference.
i := path.index_byte(`:`)
i := path.index_u8(`:`)
if i > -1 {
// TODO remove this when autofree handles tmp
// expressions like this
if i > -1 && path[..i].index_byte(`/`) == -1 {
if i > -1 && path[..i].index_u8(`/`) == -1 {
buf.write_string('./')
}
}
@@ -1006,7 +1006,7 @@ pub fn (u &URL) port() string {
fn split_host_port(hostport string) (string, string) {
mut host := hostport
mut port := ''
colon := host.last_index_byte(`:`)
colon := host.last_index_u8(`:`)
if colon != -1 {
if valid_optional_port(host[colon..]) {
port = host[colon + 1..]
@@ -1052,7 +1052,7 @@ pub fn valid_userinfo(s string) bool {
}
// string_contains_ctl_byte reports whether s contains any ASCII control character.
fn string_contains_ctl_byte(s string) bool {
fn string_contains_ctl_u8(s string) bool {
for i in 0 .. s.len {
b := s[i]
if b < ` ` || b == 0x7f {

18
vlib/net/websocket/utils.v
View File

@@ -7,20 +7,20 @@ import encoding.base64
// htonl64 converts payload length to header bits
fn htonl64(payload_len u64) []byte {
mut ret := []byte{len: 8}
ret[0] = byte(((payload_len & (u64(0xff) << 56)) >> 56) & 0xff)
ret[1] = byte(((payload_len & (u64(0xff) << 48)) >> 48) & 0xff)
ret[2] = byte(((payload_len & (u64(0xff) << 40)) >> 40) & 0xff)
ret[3] = byte(((payload_len & (u64(0xff) << 32)) >> 32) & 0xff)
ret[4] = byte(((payload_len & (u64(0xff) << 24)) >> 24) & 0xff)
ret[5] = byte(((payload_len & (u64(0xff) << 16)) >> 16) & 0xff)
ret[6] = byte(((payload_len & (u64(0xff) << 8)) >> 8) & 0xff)
ret[7] = byte(((payload_len & (u64(0xff) << 0)) >> 0) & 0xff)
ret[0] = u8(((payload_len & (u64(0xff) << 56)) >> 56) & 0xff)
ret[1] = u8(((payload_len & (u64(0xff) << 48)) >> 48) & 0xff)
ret[2] = u8(((payload_len & (u64(0xff) << 40)) >> 40) & 0xff)
ret[3] = u8(((payload_len & (u64(0xff) << 32)) >> 32) & 0xff)
ret[4] = u8(((payload_len & (u64(0xff) << 24)) >> 24) & 0xff)
ret[5] = u8(((payload_len & (u64(0xff) << 16)) >> 16) & 0xff)
ret[6] = u8(((payload_len & (u64(0xff) << 8)) >> 8) & 0xff)
ret[7] = u8(((payload_len & (u64(0xff) << 0)) >> 0) & 0xff)
return ret
}
// create_masking_key returs a new masking key to use when masking websocket messages
fn create_masking_key() []byte {
mask_bit := rand.byte()
mask_bit := rand.u8()
buf := []byte{len: 4, init: `0`}
unsafe { C.memcpy(buf.data, &mask_bit, 4) }
return buf

20
vlib/net/websocket/websocket_client.v
View File

@@ -241,11 +241,11 @@ pub fn (mut ws Client) write_ptr(bytes &byte, payload_len int, code OPCode) ?int
header_len += 4
}
mut header := []byte{len: header_len, init: `0`} // [`0`].repeat(header_len)
header[0] = byte(int(code)) | 0x80
header[0] = u8(int(code)) | 0x80
masking_key := create_masking_key()
if ws.is_server {
if payload_len <= 125 {
header[1] = byte(payload_len)
header[1] = u8(payload_len)
} else if payload_len > 125 && payload_len <= 0xffff {
len16 := C.htons(payload_len)
header[1] = 126
@@ -257,7 +257,7 @@ pub fn (mut ws Client) write_ptr(bytes &byte, payload_len int, code OPCode) ?int
}
} else {
if payload_len <= 125 {
header[1] = byte(payload_len | 0x80)
header[1] = u8(payload_len | 0x80)
header[2] = masking_key[0]
header[3] = masking_key[1]
header[4] = masking_key[2]
@@ -286,7 +286,7 @@ pub fn (mut ws Client) write_ptr(bytes &byte, payload_len int, code OPCode) ?int
len := header.len + payload_len
mut frame_buf := []byte{len: len}
unsafe {
C.memcpy(&frame_buf[0], &byte(header.data), header.len)
C.memcpy(&frame_buf[0], &u8(header.data), header.len)
if payload_len > 0 {
C.memcpy(&frame_buf[header.len], bytes, payload_len)
}
@@ -307,7 +307,7 @@ pub fn (mut ws Client) write_ptr(bytes &byte, payload_len int, code OPCode) ?int
// write writes a byte array with a websocket messagetype to socket
pub fn (mut ws Client) write(bytes []byte, code OPCode) ?int {
return ws.write_ptr(&byte(bytes.data), bytes.len, code)
return ws.write_ptr(&u8(bytes.data), bytes.len, code)
}
// write_str, writes a string with a websocket texttype to socket
@@ -333,8 +333,8 @@ pub fn (mut ws Client) close(code int, message string) ? {
code_ := C.htons(code)
message_len := message.len + 2
mut close_frame := []byte{len: message_len}
close_frame[0] = byte(code_ & 0xFF)
close_frame[1] = byte(code_ >> 8)
close_frame[0] = u8(code_ & 0xFF)
close_frame[1] = u8(code_ >> 8)
// code32 = (close_frame[0] << 8) + close_frame[1]
for i in 0 .. message.len {
close_frame[i + 2] = message[i]
@@ -365,15 +365,15 @@ fn (mut ws Client) send_control_frame(code OPCode, frame_typ string, payload []b
}
}
}
control_frame[0] = byte(int(code) | 0x80)
control_frame[0] = u8(int(code) | 0x80)
if !ws.is_server {
control_frame[1] = byte(payload.len | 0x80)
control_frame[1] = u8(payload.len | 0x80)
control_frame[2] = masking_key[0]
control_frame[3] = masking_key[1]
control_frame[4] = masking_key[2]
control_frame[5] = masking_key[3]
} else {
control_frame[1] = byte(payload.len)
control_frame[1] = u8(payload.len)
}
if code == .close {
if payload.len >= 2 {