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

builtin: make v_realloc use int parameter instead of u32 (#7080)

Browse Source
This commit is contained in:
heronwr 2020-12-02 08:35:11 -05:00 committed by GitHub
parent cd46eb42d7
commit f8af866f76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/builtin/array.v
View File

@ -96,7 +96,7 @@ fn (mut a array) ensure_cap(required int) {
if a.cap == 0 { if a.cap == 0 {
a.data = vcalloc(cap * a.element_size) a.data = vcalloc(cap * a.element_size)
} else { } else {
a.data = v_realloc(a.data, u32(cap * a.element_size)) a.data = v_realloc(a.data, cap * a.element_size)
} }
a.cap = cap a.cap = cap
} }

4
vlib/builtin/builtin.v
View File

@ -171,10 +171,10 @@ TODO
//fn malloc_size(b byteptr) int //fn malloc_size(b byteptr) int
[unsafe] [unsafe]
pub fn v_realloc(b byteptr, n u32) byteptr { pub fn v_realloc(b byteptr, n int) byteptr {
$if prealloc { $if prealloc {
unsafe { unsafe {
new_ptr := malloc(int(n)) new_ptr := malloc(n)
size := 0 //malloc_size(b) size := 0 //malloc_size(b)
C.memcpy(new_ptr, b, size) C.memcpy(new_ptr, b, size)
return new_ptr return new_ptr

18
vlib/builtin/map.v
View File

@ -124,9 +124,9 @@ fn (mut d DenseArray) push(key string, value voidptr) u32 {
if d.cap == d.len { if d.cap == d.len {
d.cap += d.cap >> 3 d.cap += d.cap >> 3
unsafe { unsafe {
x := v_realloc(byteptr(d.keys), sizeof(string) * d.cap) x := v_realloc(byteptr(d.keys), int(sizeof(string) * d.cap))
d.keys = &string(x) d.keys = &string(x)
d.values = v_realloc(byteptr(d.values), u32(d.value_bytes) * d.cap) d.values = v_realloc(byteptr(d.values), d.value_bytes * int(d.cap))
} }
} }
push_index := d.len push_index := d.len
@ -175,9 +175,9 @@ fn (mut d DenseArray) zeros_to_end() {
d.len = count d.len = count
d.cap = if count < 8 { u32(8) } else { count } d.cap = if count < 8 { u32(8) } else { count }
unsafe { unsafe {
x := v_realloc(byteptr(d.keys), sizeof(string) * d.cap) x := v_realloc(byteptr(d.keys), int(sizeof(string) * d.cap))
d.keys = &string(x) d.keys = &string(x)
d.values = v_realloc(byteptr(d.values), u32(d.value_bytes) * d.cap) d.values = v_realloc(byteptr(d.values), d.value_bytes * int(d.cap))
} }
} }
@ -283,9 +283,9 @@ fn (mut m map) ensure_extra_metas(probe_count u32) {
m.extra_metas += extra_metas_inc m.extra_metas += extra_metas_inc
mem_size := (m.cap + 2 + m.extra_metas) mem_size := (m.cap + 2 + m.extra_metas)
unsafe { unsafe {
x := v_realloc(byteptr(m.metas), sizeof(u32) * mem_size) x := v_realloc(byteptr(m.metas), int(sizeof(u32) * mem_size))
m.metas = &u32(x) m.metas = &u32(x)
C.memset(m.metas + mem_size - extra_metas_inc, 0, sizeof(u32) * extra_metas_inc) C.memset(m.metas + mem_size - extra_metas_inc, 0, int(sizeof(u32) * extra_metas_inc))
} }
// Should almost never happen // Should almost never happen
if probe_count == 252 { if probe_count == 252 {
@ -346,7 +346,7 @@ fn (mut m map) expand() {
fn (mut m map) rehash() { fn (mut m map) rehash() {
meta_bytes := sizeof(u32) * (m.cap + 2 + m.extra_metas) meta_bytes := sizeof(u32) * (m.cap + 2 + m.extra_metas)
unsafe { unsafe {
x := v_realloc(byteptr(m.metas), meta_bytes) x := v_realloc(byteptr(m.metas), int(meta_bytes))
m.metas = &u32(x) m.metas = &u32(x)
C.memset(m.metas, 0, meta_bytes) C.memset(m.metas, 0, meta_bytes)
} }
@ -407,8 +407,8 @@ fn (mut m map) get_and_set(key string, zero voidptr) voidptr {
// Key not found, insert key with zero-value // Key not found, insert key with zero-value
m.set(key, zero) m.set(key, zero)
} }
assert false assert false
return voidptr(0) return voidptr(0)
} }
// If `key` matches the key of an element in the container, // If `key` matches the key of an element in the container,

2
vlib/os/os.v
View File

@ -766,7 +766,7 @@ pub fn get_raw_stdin() []byte {
break break
} }
buf = v_realloc(buf, u32(offset + block_bytes + (block_bytes-bytes_read))) buf = v_realloc(buf, offset + block_bytes + (block_bytes-bytes_read))
} }
C.CloseHandle(h_input) C.CloseHandle(h_input)