diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-07-29 22:38:15 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 22:38:15 +0300 |
commit | 90334a8497f3637876806deb159c4d9c39a7899b (patch) | |
tree | 8bb9fe20f719fdf795ada369f045b91aa89bfc84 /packfile.c | |
parent | 0726f13074c1c93cdedd8a9f6a10b579fd6ecba6 (diff) | |
parent | 921d49be86bd44ca290c8db6cc6f419dac3ed442 (diff) |
Merge branch 'rs/copy-array' into maint
Code clean-up.
* rs/copy-array:
use COPY_ARRAY for copying arrays
coccinelle: use COPY_ARRAY for copying arrays
Diffstat (limited to 'packfile.c')
-rw-r--r-- | packfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packfile.c b/packfile.c index d786ec7312..d55cb7f013 100644 --- a/packfile.c +++ b/packfile.c @@ -1269,7 +1269,7 @@ static enum object_type packed_to_object_type(struct repository *r, if (poi_stack_nr >= poi_stack_alloc && poi_stack == small_poi_stack) { poi_stack_alloc = alloc_nr(poi_stack_nr); ALLOC_ARRAY(poi_stack, poi_stack_alloc); - memcpy(poi_stack, small_poi_stack, sizeof(off_t)*poi_stack_nr); + COPY_ARRAY(poi_stack, small_poi_stack, poi_stack_nr); } else { ALLOC_GROW(poi_stack, poi_stack_nr+1, poi_stack_alloc); } @@ -1679,8 +1679,8 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset, && delta_stack == small_delta_stack) { delta_stack_alloc = alloc_nr(delta_stack_nr); ALLOC_ARRAY(delta_stack, delta_stack_alloc); - memcpy(delta_stack, small_delta_stack, - sizeof(*delta_stack)*delta_stack_nr); + COPY_ARRAY(delta_stack, small_delta_stack, + delta_stack_nr); } else { ALLOC_GROW(delta_stack, delta_stack_nr+1, delta_stack_alloc); } |