diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:09 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:09 -0800 |
commit | f06a5e607dde266884db4a99b70fbee09d5c5efc (patch) | |
tree | 76f4f796e45646182ffce1146b6a1017fcfd7320 /csum-file.h | |
parent | 4ba46c28471b94de561d00f8b01da79b59527c62 (diff) | |
parent | 9af270e8c2a02afd9a3262a2c9312ee7fefbb7a3 (diff) | |
download | git-f06a5e607dde266884db4a99b70fbee09d5c5efc.tar.gz |
Merge branch 'jk/sha1write-void'
Code clean-up.
* jk/sha1write-void:
do not pretend sha1write returns errors
Diffstat (limited to 'csum-file.h')
-rw-r--r-- | csum-file.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/csum-file.h b/csum-file.h index 9dedb038ea..bb543d52f1 100644 --- a/csum-file.h +++ b/csum-file.h @@ -34,7 +34,7 @@ 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 int sha1write(struct sha1file *, const void *, 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 *); |