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

array: malloc => calloc

Browse Source
This commit is contained in:
vitalyster 2019-09-21 02:29:09 +03:00 committed by Alexander Medvednikov
parent 56e880117e
commit 111007470e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vlib/builtin/array.v
View File

@ -40,7 +40,7 @@ fn new_array_from_c_array(len, cap, elm_size int, c_array voidptr) array {
len: len len: len
cap: cap cap: cap
element_size: elm_size element_size: elm_size
data: malloc(cap * elm_size) data: calloc(cap * elm_size)
} }
// TODO Write all memory functions (like memcpy) in V // TODO Write all memory functions (like memcpy) in V
C.memcpy(arr.data, c_array, len * elm_size) C.memcpy(arr.data, c_array, len * elm_size)
@ -64,7 +64,7 @@ fn array_repeat_old(val voidptr, nr_repeats, elm_size int) array {
len: nr_repeats len: nr_repeats
cap: nr_repeats cap: nr_repeats
element_size: elm_size element_size: elm_size
data: malloc(nr_repeats * elm_size) data: calloc(nr_repeats * elm_size)
} }
for i := 0; i < nr_repeats; i++ { for i := 0; i < nr_repeats; i++ {
C.memcpy(arr.data + i * elm_size, val, elm_size) C.memcpy(arr.data + i * elm_size, val, elm_size)
@ -77,7 +77,7 @@ pub fn (a array) repeat(nr_repeats int) array {
len: nr_repeats len: nr_repeats
cap: nr_repeats cap: nr_repeats
element_size: a.element_size element_size: a.element_size
data: malloc(nr_repeats * a.element_size) data: calloc(nr_repeats * a.element_size)
} }
val := a.data + 0 //nr_repeats * a.element_size val := a.data + 0 //nr_repeats * a.element_size
for i := 0; i < nr_repeats; i++ { for i := 0; i < nr_repeats; i++ {
@ -180,7 +180,7 @@ fn (arr mut array) _push(val voidptr) {
cap := (arr.len + 1) * 2 cap := (arr.len + 1) * 2
// println('_push: realloc, new cap=$cap') // println('_push: realloc, new cap=$cap')
if arr.cap == 0 { if arr.cap == 0 {
arr.data = malloc(cap * arr.element_size) arr.data = calloc(cap * arr.element_size)
} }
else { else {
arr.data = C.realloc(arr.data, cap * arr.element_size) arr.data = C.realloc(arr.data, cap * arr.element_size)
@ -198,7 +198,7 @@ pub fn (arr mut array) _push_many(val voidptr, size int) {
cap := (arr.len + size) * 2 cap := (arr.len + size) * 2
// println('_push: realloc, new cap=$cap') // println('_push: realloc, new cap=$cap')
if arr.cap == 0 { if arr.cap == 0 {
arr.data = malloc(cap * arr.element_size) arr.data = calloc(cap * arr.element_size)
} }
else { else {
arr.data = C.realloc(arr.data, cap * arr.element_size) arr.data = C.realloc(arr.data, cap * arr.element_size)
@ -214,7 +214,7 @@ pub fn (a array) reverse() array {
len: a.len len: a.len
cap: a.cap cap: a.cap
element_size: a.element_size element_size: a.element_size
data: malloc(a.cap * a.element_size) data: calloc(a.cap * a.element_size)
} }
for i := 0; i < a.len; i++ { for i := 0; i < a.len; i++ {
C.memcpy(arr.data + i * arr.element_size, &a[a.len-1-i], arr.element_size) C.memcpy(arr.data + i * arr.element_size, &a[a.len-1-i], arr.element_size)
@ -227,7 +227,7 @@ pub fn (a array) clone() array {
len: a.len len: a.len
cap: a.cap cap: a.cap
element_size: a.element_size element_size: a.element_size
data: malloc(a.cap * a.element_size) data: calloc(a.cap * a.element_size)
} }
C.memcpy(arr.data, a.data, a.cap * a.element_size) C.memcpy(arr.data, a.data, a.cap * a.element_size)
return arr return arr