diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-03 13:30:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-03 13:30:33 -0700 |
| commit | b1f0a856605981363053941b8210f3cc9389607a (patch) | |
| tree | 9de4bc7cc285925913c219edd4536985cc0cc256 /split-index.c | |
| parent | 3ef7618e616e023cf04180e30d77c9fa5310f964 (diff) | |
| parent | 45ccef87b3cc0ab09ec5fd1186aa0b33298ee8d4 (diff) | |
| download | git-b1f0a856605981363053941b8210f3cc9389607a.tar.gz git-b1f0a856605981363053941b8210f3cc9389607a.tar.xz | |
Merge branch 'rs/copy-array'
Code cleanup.
* rs/copy-array:
use COPY_ARRAY
add COPY_ARRAY
Diffstat (limited to 'split-index.c')
| -rw-r--r-- | split-index.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/split-index.c b/split-index.c index 3c75d4b9c..35da55365 100644 --- a/split-index.c +++ b/split-index.c @@ -83,8 +83,7 @@ void move_cache_to_base_index(struct index_state *istate) si->base->timestamp = istate->timestamp; ALLOC_GROW(si->base->cache, istate->cache_nr, si->base->cache_alloc); si->base->cache_nr = istate->cache_nr; - memcpy(si->base->cache, istate->cache, - sizeof(*istate->cache) * istate->cache_nr); + COPY_ARRAY(si->base->cache, istate->cache, istate->cache_nr); mark_base_index_entries(si->base); for (i = 0; i < si->base->cache_nr; i++) si->base->cache[i]->ce_flags &= ~CE_UPDATE_IN_BASE; @@ -141,8 +140,7 @@ void merge_base_index(struct index_state *istate) istate->cache = NULL; istate->cache_alloc = 0; ALLOC_GROW(istate->cache, istate->cache_nr, istate->cache_alloc); - memcpy(istate->cache, si->base->cache, - sizeof(*istate->cache) * istate->cache_nr); + COPY_ARRAY(istate->cache, si->base->cache, istate->cache_nr); si->nr_deletions = 0; si->nr_replacements = 0; |