diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-02-01 02:18:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-02 19:28:41 (GMT) |
| commit | 4d2735005a6512c4dae8b9ed892640db91351dff (patch) | |
| tree | 3928da1bf2ca8adfff3324da70cceeadc4524ebf /csum-file.c | |
| parent | 98a3beab6a218eeed33c82fef697c0fd8181ea95 (diff) | |
| download | git-4d2735005a6512c4dae8b9ed892640db91351dff.zip git-4d2735005a6512c4dae8b9ed892640db91351dff.tar.gz git-4d2735005a6512c4dae8b9ed892640db91351dff.tar.bz2 | |
csum-file: abstract uses of SHA-1
Convert several direct uses of SHA-1 to use the_hash_algo instead.
Convert one use of the constant 20 as well.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'csum-file.c')
| -rw-r--r-- | csum-file.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/csum-file.c b/csum-file.c index e4ad633..5eda7fb 100644 --- a/csum-file.c +++ b/csum-file.c @@ -47,7 +47,7 @@ void hashflush(struct hashfile *f) unsigned offset = f->offset; if (offset) { - git_SHA1_Update(&f->ctx, f->buffer, offset); + the_hash_algo->update_fn(&f->ctx, f->buffer, offset); flush(f, f->buffer, offset); f->offset = 0; } @@ -58,12 +58,12 @@ int hashclose(struct hashfile *f, unsigned char *result, unsigned int flags) int fd; hashflush(f); - git_SHA1_Final(f->buffer, &f->ctx); + the_hash_algo->final_fn(f->buffer, &f->ctx); if (result) hashcpy(result, f->buffer); if (flags & (CSUM_CLOSE | CSUM_FSYNC)) { /* write checksum and close fd */ - flush(f, f->buffer, 20); + flush(f, f->buffer, the_hash_algo->rawsz); if (flags & CSUM_FSYNC) fsync_or_die(f->fd, f->name); if (close(f->fd)) @@ -110,7 +110,7 @@ void hashwrite(struct hashfile *f, const void *buf, unsigned int count) buf = (char *) buf + nr; left -= nr; if (!left) { - git_SHA1_Update(&f->ctx, data, offset); + the_hash_algo->update_fn(&f->ctx, data, offset); flush(f, data, offset); offset = 0; } @@ -149,7 +149,7 @@ struct hashfile *hashfd_throughput(int fd, const char *name, struct progress *tp f->tp = tp; f->name = name; f->do_crc = 0; - git_SHA1_Init(&f->ctx); + the_hash_algo->init_fn(&f->ctx); return f; } |