X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=blame.c;h=8cfd5d94c777770a2019e058f1140ecd5a5c9aa2;hb=a2a3bf7b2baf0ff64c5b5ffc78d54be82d9967f1;hp=c253b9ca45cf7d860052ddae95bc1ed34974ffb8;hpb=96f1e58f524fac8607cfc38896b365b6e8365b51;p=git.git diff --git a/blame.c b/blame.c index c253b9ca4..8cfd5d94c 100644 --- a/blame.c +++ b/blame.c @@ -165,7 +165,7 @@ static int get_blob_sha1(struct tree *t, const char *pathname, blame_file = pathname; pathspec[0] = pathname; pathspec[1] = NULL; - memset(blob_sha1, 0, sizeof(blob_sha1)); + hashclr(blob_sha1); read_tree_recursive(t, "", 0, 0, pathspec, get_blob_sha1_internal); for (i = 0; i < 20; i++) { @@ -176,7 +176,7 @@ static int get_blob_sha1(struct tree *t, const char *pathname, if (i == 20) return -1; - memcpy(sha1, blob_sha1, 20); + hashcpy(sha1, blob_sha1); return 0; } @@ -191,7 +191,7 @@ static int get_blob_sha1_internal(const unsigned char *sha1, const char *base, strcmp(blame_file + baselen, pathname)) return -1; - memcpy(blob_sha1, sha1, 20); + hashcpy(blob_sha1, sha1); return -1; } @@ -617,7 +617,7 @@ static void simplify_commit(struct rev_info *revs, struct commit *commit) if (new_name) { struct util_info* putil = get_util(p); if (!putil->pathname) - putil->pathname = strdup(new_name); + putil->pathname = xstrdup(new_name); } else { *pp = parent->next; continue;