X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=cache-tree.c;h=323c68a6709f30312e0dfb0fd60fcd7e69cd710b;hb=d1d866e9b8d5a6f0dbe490ba3467440bbf87feaf;hp=d9f7e1e3dd598d34e08d6370544b562daf4640d2;hpb=7b8e4ab07c6ebc72e311804c9c79ef93cfbbe704;p=git.git diff --git a/cache-tree.c b/cache-tree.c index d9f7e1e3d..323c68a67 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -335,7 +335,7 @@ static int update_one(struct cache_tree *it, offset += sprintf(buffer + offset, "%o %.*s", mode, entlen, path + baselen); buffer[offset++] = 0; - memcpy(buffer + offset, sha1, 20); + hashcpy((unsigned char*)buffer + offset, sha1); offset += 20; #if DEBUG @@ -412,7 +412,7 @@ static void *write_one(struct cache_tree *it, #endif if (0 <= it->entry_count) { - memcpy(buffer + *offset, it->sha1, 20); + hashcpy((unsigned char*)buffer + *offset, it->sha1); *offset += 20; } for (i = 0; i < it->subtree_nr; i++) { @@ -478,7 +478,7 @@ static struct cache_tree *read_one(const char **buffer, unsigned long *size_p) if (0 <= it->entry_count) { if (size < 20) goto free_return; - memcpy(it->sha1, buf, 20); + hashcpy(it->sha1, (unsigned char*)buf); buf += 20; size -= 20; }