undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

csum-file: abstract uses of SHA-1

Browse Source 
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>
This commit is contained in:
brian m. carlson 2018-02-01 02:18:47 +00:00 committed by Junio C Hamano
parent 98a3beab6a
commit 4d2735005a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
csum-file.c
View File

@ -47,7 +47,7 @@ void hashflush(struct hashfile *f)
unsigned offset = f->offset; unsigned offset = f->offset;
if (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); flush(f, f->buffer, offset);
f->offset = 0; f->offset = 0;
} }
@ -58,12 +58,12 @@ int hashclose(struct hashfile *f, unsigned char *result, unsigned int flags)
int fd; int fd;
hashflush(f); hashflush(f);
git_SHA1_Final(f->buffer, &f->ctx); the_hash_algo->final_fn(f->buffer, &f->ctx);
if (result) if (result)
hashcpy(result, f->buffer); hashcpy(result, f->buffer);
if (flags & (CSUM_CLOSE | CSUM_FSYNC)) { if (flags & (CSUM_CLOSE | CSUM_FSYNC)) {
/* write checksum and close fd */ /* write checksum and close fd */
flush(f, f->buffer, 20); flush(f, f->buffer, the_hash_algo->rawsz);
if (flags & CSUM_FSYNC) if (flags & CSUM_FSYNC)
fsync_or_die(f->fd, f->name); fsync_or_die(f->fd, f->name);
if (close(f->fd)) if (close(f->fd))
@ -110,7 +110,7 @@ void hashwrite(struct hashfile *f, const void *buf, unsigned int count)
buf = (char *) buf + nr; buf = (char *) buf + nr;
left -= nr; left -= nr;
if (!left) { if (!left) {
git_SHA1_Update(&f->ctx, data, offset); the_hash_algo->update_fn(&f->ctx, data, offset);
flush(f, data, offset); flush(f, data, offset);
offset = 0; offset = 0;
} }
@ -149,7 +149,7 @@ struct hashfile *hashfd_throughput(int fd, const char *name, struct progress *tp
f->tp = tp; f->tp = tp;
f->name = name; f->name = name;
f->do_crc = 0; f->do_crc = 0;
git_SHA1_Init(&f->ctx); the_hash_algo->init_fn(&f->ctx);
return f; return f;
} }

4
csum-file.h
View File

@ -8,7 +8,7 @@ struct hashfile {
int fd; int fd;
int check_fd; int check_fd;
unsigned int offset; unsigned int offset;
git_SHA_CTX ctx; git_hash_ctx ctx;
off_t total; off_t total;
struct progress *tp; struct progress *tp;
const char *name; const char *name;
@ -20,7 +20,7 @@ struct hashfile {
/* Checkpoint */ /* Checkpoint */
struct hashfile_checkpoint { struct hashfile_checkpoint {
off_t offset; off_t offset;
git_SHA_CTX ctx; git_hash_ctx ctx;
}; };
extern void hashfile_checkpoint(struct hashfile *, struct hashfile_checkpoint *); extern void hashfile_checkpoint(struct hashfile *, struct hashfile_checkpoint *);