diff options
author | Junio C Hamano <junkio@cox.net> | 2006-04-05 00:43:00 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-04-05 00:43:00 +0400 |
commit | 810e1523753553968aac827f57e0e24fc9af6546 (patch) | |
tree | 47ec02a8c4a16c1f04e79e10a9b47cbcdfe4f564 /update-index.c | |
parent | 4c61b7d15a6215fa4dffa33c37c3ef9df80d3f67 (diff) | |
parent | 90321c106ca6e36c0e884ca677c9a52dea47bdde (diff) |
Merge branch 'pe/cleanup'
* pe/cleanup:
Replace xmalloc+memset(0) with xcalloc.
Use blob_, commit_, tag_, and tree_type throughout.
Diffstat (limited to 'update-index.c')
-rw-r--r-- | update-index.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/update-index.c b/update-index.c index 797245ab27..1efac27c6b 100644 --- a/update-index.c +++ b/update-index.c @@ -114,8 +114,7 @@ static int add_file_to_cache(const char *path) namelen = strlen(path); size = cache_entry_size(namelen); - ce = xmalloc(size); - memset(ce, 0, size); + ce = xcalloc(1, size); memcpy(ce->name, path, namelen); ce->ce_flags = htons(namelen); fill_stat_cache_info(ce, &st); @@ -312,8 +311,7 @@ static int add_cacheinfo(unsigned int mode, const unsigned char *sha1, len = strlen(path); size = cache_entry_size(len); - ce = xmalloc(size); - memset(ce, 0, size); + ce = xcalloc(1, size); memcpy(ce->sha1, sha1, 20); memcpy(ce->name, path, len); |