csum-file: rename sha1file to hashfile

Rename struct sha1file to struct hashfile, along with all of its related
functions.

The transformation in this commit was made by global search-and-replace.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2018-02-01 02:18:46 +00:00
committed by Junio C Hamano
parent aab6135906
commit 98a3beab6a
9 changed files with 126 additions and 126 deletions

View File

@ -4,7 +4,7 @@
struct progress;
/* A SHA1-protected file */
struct sha1file {
struct hashfile {
int fd;
int check_fd;
unsigned int offset;
@ -18,36 +18,36 @@ struct sha1file {
};
/* Checkpoint */
struct sha1file_checkpoint {
struct hashfile_checkpoint {
off_t offset;
git_SHA_CTX ctx;
};
extern void sha1file_checkpoint(struct sha1file *, struct sha1file_checkpoint *);
extern int sha1file_truncate(struct sha1file *, struct sha1file_checkpoint *);
extern void hashfile_checkpoint(struct hashfile *, struct hashfile_checkpoint *);
extern int hashfile_truncate(struct hashfile *, struct hashfile_checkpoint *);
/* sha1close flags */
/* hashclose flags */
#define CSUM_CLOSE 1
#define CSUM_FSYNC 2
extern struct sha1file *sha1fd(int fd, const char *name);
extern struct sha1file *sha1fd_check(const char *name);
extern struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp);
extern int sha1close(struct sha1file *, unsigned char *, unsigned int);
extern void sha1write(struct sha1file *, const void *, unsigned int);
extern void sha1flush(struct sha1file *f);
extern void crc32_begin(struct sha1file *);
extern uint32_t crc32_end(struct sha1file *);
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 *);
static inline void sha1write_u8(struct sha1file *f, uint8_t data)
static inline void hashwrite_u8(struct hashfile *f, uint8_t data)
{
sha1write(f, &data, sizeof(data));
hashwrite(f, &data, sizeof(data));
}
static inline void sha1write_be32(struct sha1file *f, uint32_t data)
static inline void hashwrite_be32(struct hashfile *f, uint32_t data)
{
data = htonl(data);
sha1write(f, &data, sizeof(data));
hashwrite(f, &data, sizeof(data));
}
#endif