summaryrefslogtreecommitdiff
path: root/split-index.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2016-09-25 07:24:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-25 23:44:13 (GMT)
commit45ccef87b3cc0ab09ec5fd1186aa0b33298ee8d4 (patch)
tree83dffbe2e99b0fd98a286208a655012a86fb292b /split-index.c
parent60566cbb5890abc84fa18c56da70e35ace0b23bf (diff)
downloadgit-45ccef87b3cc0ab09ec5fd1186aa0b33298ee8d4.zip
git-45ccef87b3cc0ab09ec5fd1186aa0b33298ee8d4.tar.gz
git-45ccef87b3cc0ab09ec5fd1186aa0b33298ee8d4.tar.bz2
use COPY_ARRAY
Add a semantic patch for converting certain calls of memcpy(3) to COPY_ARRAY() and apply that transformation to the code base. The result is shorter and safer code. For now only consider calls where source and destination have the same type, or in other words: easy cases. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'split-index.c')
-rw-r--r--split-index.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/split-index.c b/split-index.c
index 3c75d4b..35da5536 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;