kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

use COPY_ARRAY for copying arrays 

Convert calls of memcpy(3) to use COPY_ARRAY, which shortens and
simplifies the code a bit.

Patch generated by Coccinelle and contrib/coccinelle/array.cocci.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
René Scharfe 2019-06-15 20:36:35 +02:00 committed by Junio C Hamano
parent 177fbab747
commit 921d49be86
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fast-import.c
View File

@ -644,7 +644,7 @@ static struct tree_content *grow_tree_content(
struct tree_content *r = new_tree_content(t->entry_count + amt); struct tree_content *r = new_tree_content(t->entry_count + amt);
r->entry_count = t->entry_count; r->entry_count = t->entry_count;
r->delta_depth = t->delta_depth; r->delta_depth = t->delta_depth;
memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0])); COPY_ARRAY(r->entries, t->entries, t->entry_count);
release_tree_content(t); release_tree_content(t);
return r; return r;
} }

2
kwset.c
View File

@ -475,7 +475,7 @@ kwsprep (kwset_t kws)
for (i = 0; i < NCHAR; ++i) for (i = 0; i < NCHAR; ++i)
kwset->next[i] = next[U(trans[i])]; kwset->next[i] = next[U(trans[i])];
else else
memcpy(kwset->next, next, NCHAR * sizeof(struct trie *)); COPY_ARRAY(kwset->next, next, NCHAR);
} }


/* Fix things up for any translation table. */ /* Fix things up for any translation table. */

6
packfile.c
View File

@ -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) { if (poi_stack_nr >= poi_stack_alloc && poi_stack == small_poi_stack) {
poi_stack_alloc = alloc_nr(poi_stack_nr); poi_stack_alloc = alloc_nr(poi_stack_nr);
ALLOC_ARRAY(poi_stack, poi_stack_alloc); 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 { } else {
ALLOC_GROW(poi_stack, poi_stack_nr+1, poi_stack_alloc); 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 == small_delta_stack) {
delta_stack_alloc = alloc_nr(delta_stack_nr); delta_stack_alloc = alloc_nr(delta_stack_nr);
ALLOC_ARRAY(delta_stack, delta_stack_alloc); ALLOC_ARRAY(delta_stack, delta_stack_alloc);
memcpy(delta_stack, small_delta_stack, COPY_ARRAY(delta_stack, small_delta_stack,
sizeof(*delta_stack)*delta_stack_nr); delta_stack_nr);
} else { } else {
ALLOC_GROW(delta_stack, delta_stack_nr+1, delta_stack_alloc); ALLOC_GROW(delta_stack, delta_stack_nr+1, delta_stack_alloc);
} }

4
pretty.c
View File

@ -106,8 +106,8 @@ static void setup_commit_formats(void)
commit_formats_len = ARRAY_SIZE(builtin_formats); commit_formats_len = ARRAY_SIZE(builtin_formats);
builtin_formats_len = commit_formats_len; builtin_formats_len = commit_formats_len;
ALLOC_GROW(commit_formats, commit_formats_len, commit_formats_alloc); ALLOC_GROW(commit_formats, commit_formats_len, commit_formats_alloc);
memcpy(commit_formats, builtin_formats, COPY_ARRAY(commit_formats, builtin_formats,
sizeof(*builtin_formats)*ARRAY_SIZE(builtin_formats)); ARRAY_SIZE(builtin_formats));


git_config(git_pretty_formats_config, NULL); git_config(git_pretty_formats_config, NULL);
} }