Merge branch 'jc/calloc-fix'

Code clean-up.

* jc/calloc-fix:
  xcalloc: use CALLOC_ARRAY() when applicable

diff --cc builtin/receive-pack.c
Simple merge

diff --cc t/helper/test-bloom.c
Simple merge