diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-26 14:39:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-26 14:39:45 -0700 |
| commit | 1c2ea2cdc0e8c4e5af942c51b234c5af527944f6 (patch) | |
| tree | 26554b52f6dcd97e2194c4b0c32106b6a2b72f92 /builtin/for-each-ref.c | |
| parent | b33000878a88b52816b97aeb88ba3677902ad277 (diff) | |
| parent | 2756ca4347cbda05b16954cd7f445c216b935e76 (diff) | |
| download | git-1c2ea2cdc0e8c4e5af942c51b234c5af527944f6.tar.gz | |
Merge branch 'rs/realloc-array'
Code cleanup.
* rs/realloc-array:
use REALLOC_ARRAY for changing the allocation size of arrays
add macro REALLOC_ARRAY
Diffstat (limited to 'builtin/for-each-ref.c')
| -rw-r--r-- | builtin/for-each-ref.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 69bba06718..fda0f04712 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -138,10 +138,8 @@ static int parse_atom(const char *atom, const char *ep) /* Add it in, including the deref prefix */ at = used_atom_cnt; used_atom_cnt++; - used_atom = xrealloc(used_atom, - (sizeof *used_atom) * used_atom_cnt); - used_atom_type = xrealloc(used_atom_type, - (sizeof(*used_atom_type) * used_atom_cnt)); + REALLOC_ARRAY(used_atom, used_atom_cnt); + REALLOC_ARRAY(used_atom_type, used_atom_cnt); used_atom[at] = xmemdupz(atom, ep - atom); used_atom_type[at] = valid_atom[i].cmp_type; if (*atom == '*') @@ -870,8 +868,7 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f ref->flag = flag; cnt = cb->grab_cnt; - cb->grab_array = xrealloc(cb->grab_array, - sizeof(*cb->grab_array) * (cnt + 1)); + REALLOC_ARRAY(cb->grab_array, cnt + 1); cb->grab_array[cnt++] = ref; cb->grab_cnt = cnt; return 0; |