diff options
author | Shawn Pearce <spearce@spearce.org> | 2006-08-23 02:49:00 -0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-08-23 13:53:10 -0700 |
commit | e702496e434a160f798447b95b9cea3cd138c140 (patch) | |
tree | 76b73202f627b69604b8a6e7d0e2f9c5eb0e27a9 /builtin-read-tree.c | |
parent | b05faa2da9ec24d737bbba47c71e815255f3eaa7 (diff) | |
download | git-e702496e434a160f798447b95b9cea3cd138c140.tar.gz git-e702496e434a160f798447b95b9cea3cd138c140.tar.xz |
Convert memcpy(a,b,20) to hashcpy(a,b).
This abstracts away the size of the hash values when copying them
from memory location to memory location, much as the introduction
of hashcmp abstracted away hash value comparsion.
A few call sites were using char* rather than unsigned char* so
I added the cast rather than open hashcpy to be void*. This is a
reasonable tradeoff as most call sites already use unsigned char*
and the existing hashcmp is also declared to be unsigned char*.
[jc: Splitted the patch to "master" part, to be followed by a
patch for merge-recursive.c which is not in "master" yet.
Fixed the cast in the latter hunk to combine-diff.c which was
wrong in the original.
Also converted ones left-over in combine-diff.c, diff-lib.c and
upload-pack.c ]
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-read-tree.c')
-rw-r--r-- | builtin-read-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c index 53087faf7..c1867d2a0 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -53,7 +53,7 @@ static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree) struct name_entry entry; int cnt; - memcpy(it->sha1, tree->object.sha1, 20); + hashcpy(it->sha1, tree->object.sha1); desc.buf = tree->buffer; desc.size = tree->size; cnt = 0; |