diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-26 08:06:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-26 08:06:22 (GMT) |
| commit | a7f051987c5f020e60da1e5d6ddefc3d443d3299 (patch) | |
| tree | ad35bcb194fce5509db30e12b499920b01ccc930 /builtin-update-index.c | |
| parent | 030b52087f0a4b7b1178d34839868ce438eb2f0e (diff) | |
| parent | a8e0d16d85fb2ea53775f64549cac2396cd621a6 (diff) | |
| download | git-a7f051987c5f020e60da1e5d6ddefc3d443d3299.zip git-a7f051987c5f020e60da1e5d6ddefc3d443d3299.tar.gz git-a7f051987c5f020e60da1e5d6ddefc3d443d3299.tar.bz2 | |
Merge branch 'gl/cleanup'
* gl/cleanup:
Convert memset(hash,0,20) to hashclr(hash).
Convert memcpy(a,b,20) to hashcpy(a,b).
Diffstat (limited to 'builtin-update-index.c')
| -rw-r--r-- | builtin-update-index.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-update-index.c b/builtin-update-index.c index 75c0abb..0620e77 100644 --- a/builtin-update-index.c +++ b/builtin-update-index.c @@ -142,7 +142,7 @@ static int add_cacheinfo(unsigned int mode, const unsigned char *sha1, size = cache_entry_size(len); ce = xcalloc(1, size); - memcpy(ce->sha1, sha1, 20); + hashcpy(ce->sha1, sha1); memcpy(ce->name, path, len); ce->ce_flags = create_ce_flags(len, stage); ce->ce_mode = create_ce_mode(mode); @@ -333,7 +333,7 @@ static struct cache_entry *read_one_ent(const char *which, size = cache_entry_size(namelen); ce = xcalloc(1, size); - memcpy(ce->sha1, sha1, 20); + hashcpy(ce->sha1, sha1); memcpy(ce->name, path, namelen); ce->ce_flags = create_ce_flags(namelen, stage); ce->ce_mode = create_ce_mode(mode); |