Re: [PATCH 1/2] code cleanup in sha1_file.c: xmalloc -> xcalloc
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 10, 2009, 16:43 UTC
- Message-ID
- <7v3aemnsxp.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <1234334612-24907-1-git-send-email-guanqun.lu@gmail.com>
Guanqun Lu <guanqun.lu@gmail.com> writes:
> 'xmalloc' followed immediately by 'memset' is replaced > with 'xcalloc', and a simple grep in this project seems > to show that it's the only place.
But isn't this memset() done only for the initial part of the allocated area, not the whole thing? You are not cleaning up but changing what it does, if I am reading this code correctly.
Show 21 quoted lines
> Signed-off-by: Guanqun Lu <guanqun.lu@gmail.com>
> ---
> sha1_file.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/sha1_file.c b/sha1_file.c
> index 8868b80..93e5fc0 100644
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -858,8 +858,7 @@ unsigned char* use_pack(struct packed_git *p,
>
> static struct packed_git *alloc_packed_git(int extra)
> {
> - struct packed_git *p = xmalloc(sizeof(*p) + extra);
> - memset(p, 0, sizeof(*p));
> + struct packed_git *p = xcalloc(1, sizeof(*p) + extra);
> p->pack_fd = -1;
> return p;
> }
> --
> 1.6.1.2.392.gb04d1