diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-26 01:06:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-26 01:06:22 -0700 |
| commit | a7f051987c5f020e60da1e5d6ddefc3d443d3299 (patch) | |
| tree | ad35bcb194fce5509db30e12b499920b01ccc930 /diff-lib.c | |
| parent | 030b52087f0a4b7b1178d34839868ce438eb2f0e (diff) | |
| parent | a8e0d16d85fb2ea53775f64549cac2396cd621a6 (diff) | |
| download | git-a7f051987c5f020e60da1e5d6ddefc3d443d3299.tar.gz | |
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 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/diff-lib.c b/diff-lib.c index 3e4b3b96b7..9edfa92626 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -48,7 +48,7 @@ int run_diff_files(struct rev_info *revs, int silent_on_removed) memcpy(dpath->path, ce->name, path_len); dpath->path[path_len] = '\0'; dpath->mode = 0; - memset(dpath->sha1, 0, 20); + hashclr(dpath->sha1); memset(&(dpath->parent[0]), 0, sizeof(struct combine_diff_parent)*5); @@ -66,8 +66,7 @@ int run_diff_files(struct rev_info *revs, int silent_on_removed) if (2 <= stage) { int mode = ntohl(nce->ce_mode); num_compare_stages++; - memcpy(dpath->parent[stage-2].sha1, - nce->sha1, 20); + hashcpy(dpath->parent[stage-2].sha1, nce->sha1); dpath->parent[stage-2].mode = canon_mode(mode); dpath->parent[stage-2].status = |