From: Junio C Hamano Date: Mon, 16 Jun 2014 19:18:42 +0000 (-0700) Subject: Merge branch 'rs/pack-objects-no-unnecessary-realloc' X-Git-Tag: v2.1.0-rc0~108 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/57a2eee9250fadb72cb6bace963fd1ed683c83b8?hp=3009afd54ecbac1b7cd556085cd2d32f3d6772d3 Merge branch 'rs/pack-objects-no-unnecessary-realloc' Avoid unnecessary copy of previous contents when extending the hashtable used in pack-objects. * rs/pack-objects-no-unnecessary-realloc: pack-objects: use free()+xcalloc() instead of xrealloc()+memset() --- diff --git a/pack-objects.c b/pack-objects.c index d01d851ce9..4f36c32045 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -47,8 +47,8 @@ static void rehash_objects(struct packing_data *pdata) if (pdata->index_size < 1024) pdata->index_size = 1024; - pdata->index = xrealloc(pdata->index, sizeof(uint32_t) * pdata->index_size); - memset(pdata->index, 0, sizeof(int) * pdata->index_size); + free(pdata->index); + pdata->index = xcalloc(pdata->index_size, sizeof(*pdata->index)); entry = pdata->objects;