diff options
Diffstat (limited to 'csum-file.h')
| -rw-r--r-- | csum-file.h | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/csum-file.h b/csum-file.h index 992e5c0141..f9cbd317fb 100644 --- a/csum-file.h +++ b/csum-file.h @@ -1,6 +1,8 @@ #ifndef CSUM_FILE_H #define CSUM_FILE_H +#include "hash.h" + struct progress; /* A SHA1-protected file */ @@ -23,21 +25,31 @@ struct hashfile_checkpoint { git_hash_ctx ctx; }; -extern void hashfile_checkpoint(struct hashfile *, struct hashfile_checkpoint *); -extern int hashfile_truncate(struct hashfile *, struct hashfile_checkpoint *); - -/* hashclose flags */ -#define CSUM_CLOSE 1 -#define CSUM_FSYNC 2 - -extern struct hashfile *hashfd(int fd, const char *name); -extern struct hashfile *hashfd_check(const char *name); -extern struct hashfile *hashfd_throughput(int fd, const char *name, struct progress *tp); -extern int hashclose(struct hashfile *, unsigned char *, unsigned int); -extern void hashwrite(struct hashfile *, const void *, unsigned int); -extern void hashflush(struct hashfile *f); -extern void crc32_begin(struct hashfile *); -extern uint32_t crc32_end(struct hashfile *); +void hashfile_checkpoint(struct hashfile *, struct hashfile_checkpoint *); +int hashfile_truncate(struct hashfile *, struct hashfile_checkpoint *); + +/* finalize_hashfile flags */ +#define CSUM_CLOSE 1 +#define CSUM_FSYNC 2 +#define CSUM_HASH_IN_STREAM 4 + +struct hashfile *hashfd(int fd, const char *name); +struct hashfile *hashfd_check(const char *name); +struct hashfile *hashfd_throughput(int fd, const char *name, struct progress *tp); +int finalize_hashfile(struct hashfile *, unsigned char *, unsigned int); +void hashwrite(struct hashfile *, const void *, unsigned int); +void hashflush(struct hashfile *f); +void crc32_begin(struct hashfile *); +uint32_t crc32_end(struct hashfile *); + +/* + * Returns the total number of bytes fed to the hashfile so far (including ones + * that have not been written out to the descriptor yet). + */ +static inline off_t hashfile_total(struct hashfile *f) +{ + return f->total + f->offset; +} static inline void hashwrite_u8(struct hashfile *f, uint8_t data) { |