cocci: use MEMZERO_ARRAY() a bit more

Existing code in files that have been fairly stable trigger the
"make coccicheck" suggestions due to the new check.

Rewrite them to use MEMZERO_ARRAY()

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diffcore-delta.c b/diffcore-delta.c
index ba6cbee76ba0180db352d4baf0653af201304046..2de9e9ccff321a94d501e716c74cef875541da1d 100644 (file)
--- a/diffcore-delta.c
+++ b/diffcore-delta.c
@@ -56,7 +56,7 @@ static struct spanhash_top *spanhash_rehash(struct spanhash_top *orig)
                             st_mult(sizeof(struct spanhash), sz)));
        new_spanhash->alloc_log2 = orig->alloc_log2 + 1;
        new_spanhash->free = INITIAL_FREE(new_spanhash->alloc_log2);
-       memset(new_spanhash->data, 0, sizeof(struct spanhash) * sz);
+       MEMZERO_ARRAY(new_spanhash->data, sz);
        for (i = 0; i < osz; i++) {
                struct spanhash *o = &(orig->data[i]);
                int bucket;
@@ -135,7 +135,7 @@ static struct spanhash_top *hash_chars(struct repository *r,
                              st_mult(sizeof(struct spanhash), (size_t)1 << i)));
        hash->alloc_log2 = i;
        hash->free = INITIAL_FREE(i);
-       memset(hash->data, 0, sizeof(struct spanhash) * ((size_t)1 << i));
+       MEMZERO_ARRAY(hash->data, ((size_t)1 << i));
 
        n = 0;
        accum1 = accum2 = 0;

diff --git a/linear-assignment.c b/linear-assignment.c
index 5416cbcf409d2689d4fe620564f2e010a93131b8..97b4f750586a78c768be35e3f454b67d40f15f54 100644 (file)
--- a/linear-assignment.c
+++ b/linear-assignment.c
@@ -20,8 +20,8 @@ void compute_assignment(int column_count, int row_count, int *cost,
        int i, j, phase;
 
        if (column_count < 2) {
-               memset(column2row, 0, sizeof(int) * column_count);
-               memset(row2column, 0, sizeof(int) * row_count);
+               MEMZERO_ARRAY(column2row, column_count);
+               MEMZERO_ARRAY(row2column, row_count);
                return;
        }
 

diff --git a/shallow.c b/shallow.c
index d9cd4e219cb07dcce18356668420362086deb745..c20471cd7e450b3bd951c40df13c4a04f52a0cd7 100644 (file)
--- a/shallow.c
+++ b/shallow.c
@@ -713,7 +713,7 @@ void assign_shallow_commits_to_refs(struct shallow_info *info,
 
        if (used) {
                int bitmap_size = DIV_ROUND_UP(pi.nr_bits, 32) * sizeof(uint32_t);
-               memset(used, 0, sizeof(*used) * info->shallow->nr);
+               MEMZERO_ARRAY(used, info->shallow->nr);
                for (i = 0; i < nr_shallow; i++) {
                        const struct commit *c = lookup_commit(the_repository,
                                                               &oid[shallow[i]]);
@@ -782,7 +782,7 @@ static void post_assign_shallow(struct shallow_info *info,
 
        trace_printf_key(&trace_shallow, "shallow: post_assign_shallow\n");
        if (ref_status)
-               memset(ref_status, 0, sizeof(*ref_status) * info->ref->nr);
+               MEMZERO_ARRAY(ref_status, info->ref->nr);
 
        /* Remove unreachable shallow commits from "theirs" */
        for (i = dst = 0; i < info->nr_theirs; i++) {