diff options
| author | David Rientjes <rientjes@google.com> | 2006-08-17 22:54:57 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-18 01:23:53 +0400 |
| commit | a89fccd28197fa179828c8596791ff16e2268d20 (patch) | |
| tree | 4a6c2b256a986fc221c0e1d5fa7d910f3b31eee8 /builtin-diff-stages.c | |
| parent | d4baf9eaf47ea1ba204f1ab5ecd22326913dd081 (diff) | |
Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
Introduces global inline:
hashcmp(const unsigned char *sha1, const unsigned char *sha2)
Uses memcmp for comparison and returns the result based on the length of
the hash name (a future runtime decision).
Acked-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-diff-stages.c')
| -rw-r--r-- | builtin-diff-stages.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-diff-stages.c b/builtin-diff-stages.c index 5960e08997..70bb89808d 100644 --- a/builtin-diff-stages.c +++ b/builtin-diff-stages.c @@ -46,7 +46,7 @@ static void diff_stages(int stage1, int stage2, const char **pathspec) else if (!two) diff_addremove(&diff_options, '-', ntohl(one->ce_mode), one->sha1, name, NULL); - else if (memcmp(one->sha1, two->sha1, 20) || + else if (hashcmp(one->sha1, two->sha1) || (one->ce_mode != two->ce_mode) || diff_options.find_copies_harder) diff_change(&diff_options, |