diff options
| author | Shawn Pearce <spearce@spearce.org> | 2006-08-23 06:49:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-23 20:53:10 (GMT) |
| commit | e702496e434a160f798447b95b9cea3cd138c140 (patch) | |
| tree | 76b73202f627b69604b8a6e7d0e2f9c5eb0e27a9 /index-pack.c | |
| parent | b05faa2da9ec24d737bbba47c71e815255f3eaa7 (diff) | |
| download | git-e702496e434a160f798447b95b9cea3cd138c140.zip git-e702496e434a160f798447b95b9cea3cd138c140.tar.gz git-e702496e434a160f798447b95b9cea3cd138c140.tar.bz2 | |
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 'index-pack.c')
| -rw-r--r-- | index-pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/index-pack.c b/index-pack.c index 96ea687..80bc6cb 100644 --- a/index-pack.c +++ b/index-pack.c @@ -161,7 +161,7 @@ static void *unpack_raw_entry(unsigned long offset, case OBJ_DELTA: if (pos + 20 >= pack_limit) bad_object(offset, "object extends past end of pack"); - memcpy(delta_base, pack_base + pos, 20); + hashcpy(delta_base, pack_base + pos); pos += 20; /* fallthru */ case OBJ_COMMIT: @@ -304,7 +304,7 @@ static void parse_pack_objects(void) if (obj->type == OBJ_DELTA) { struct delta_entry *delta = &deltas[nr_deltas++]; delta->obj = obj; - memcpy(delta->base_sha1, base_sha1, 20); + hashcpy(delta->base_sha1, base_sha1); } else sha1_object(data, data_size, obj->type, obj->sha1); free(data); |