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
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 {
d.cap += d.cap >> 3
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.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
@ -175,9 +175,9 @@ fn (mut d DenseArray) zeros_to_end() {
d.len = count
d.cap = if count < 8 { u32(8) } else { count }
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.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
mem_size := (m.cap + 2 + m.extra_metas)
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)
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
if probe_count == 252 {
@ -346,7 +346,7 @@ fn (mut m map) expand() {
fn (mut m map) rehash() {
meta_bytes := sizeof(u32) * (m.cap + 2 + m.extra_metas)
unsafe {
x := v_realloc(byteptr(m.metas), meta_bytes)
x := v_realloc(byteptr(m.metas), int(meta_bytes))
m.metas = &u32(x)
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
m.set(key, zero)
}
assert false
return voidptr(0)
assert false
return voidptr(0)
}
// If `key` matches the key of an element in the container,