Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

compress,coroutines,encoding: handle C calls in .v files (part of enabling -W impure-v as default) #19769

Merged
merged 7 commits into from
Nov 5, 2023
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions vlib/encoding/base64/base64_memory_test.v
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ fn test_long_encoding() {
//
encoded_size := base64.encode_in_buffer(s_original, ebuffer)
mut encoded_in_buf := []u8{len: encoded_size}
unsafe { C.memcpy(encoded_in_buf.data, ebuffer, encoded_size) }
unsafe { vmemcpy(encoded_in_buf.data, ebuffer, encoded_size) }
assert input_size * 4 / 3 == encoded_size
assert encoded_in_buf[0] == `Y`
assert encoded_in_buf[1] == `W`
Expand All @@ -38,7 +38,7 @@ fn test_long_encoding() {
decoded_size := base64.decode_in_buffer(s_encoded, dbuffer)
assert decoded_size == input_size
mut decoded_in_buf := []u8{len: decoded_size}
unsafe { C.memcpy(decoded_in_buf.data, dbuffer, decoded_size) }
unsafe { vmemcpy(decoded_in_buf.data, dbuffer, decoded_size) }
assert decoded_in_buf == s_original

mut s := 0
Expand Down
8 changes: 6 additions & 2 deletions vlib/encoding/utf8/utf8_util.v
Original file line number Diff line number Diff line change
Expand Up @@ -429,11 +429,15 @@ fn up_low(s string, upper_flag bool) string {
if ch_len == 1 {
if upper_flag == true {
unsafe {
str_res[index] = u8(C.toupper(s.str[index]))
// Subtract 0x20 from ASCII lowercase to convert to uppercase.
c := s[index]
JalonSolov marked this conversation as resolved.
Show resolved Hide resolved
str_res[index] = if c >= 0x61 && c <= 0x7a { c - 0x20 } else { c }
JalonSolov marked this conversation as resolved.
Show resolved Hide resolved
}
} else {
unsafe {
str_res[index] = u8(C.tolower(s.str[index]))
// Add 0x20 to ASCII uppercase to convert to lowercase.
c := s[index]
JalonSolov marked this conversation as resolved.
Show resolved Hide resolved
str_res[index] = if c >= 0x41 && c <= 0x5a { c + 0x20 } else { c }
JalonSolov marked this conversation as resolved.
Show resolved Hide resolved
}
}
} else if ch_len > 1 && ch_len < 5 {
Expand Down