Merge branch 'jk/sha1write-void'

Code clean-up.

* jk/sha1write-void:
  do not pretend sha1write returns errors

diff --cc csum-file.c
index 465971c7f303e29bf9501e6968da1ea71b5af76a,b30e4f28942e8fc8872f9dafa81efad5164691b8..b00b215031174a0f8ee3cd3d51c662d3cacc6b00
--- 1/csum-file.c
--- 2/csum-file.c
+++ b/csum-file.c
@@@ -86,7 -86,7 +86,7 @@@ int sha1close(struct sha1file *f, unsig
        return fd;
  }
  
- int sha1write(struct sha1file *f, const void *buf, unsigned int count)
 -void sha1write(struct sha1file *f, void *buf, unsigned int count)
++void sha1write(struct sha1file *f, const void *buf, unsigned int count)
  {
        while (count) {
                unsigned offset = f->offset;

diff --cc csum-file.h
index 9dedb038ea9c77a8fadac370e039f1672e948325,6a55c7d729ee0e5073df7f7dfdef2f59275bfdaf..bb543d52f108cf1e976ee644e337f5ccec983790
--- 1/csum-file.h
--- 2/csum-file.h
+++ b/csum-file.h
@@@ -34,7 -34,7 +34,7 @@@ extern struct sha1file *sha1fd(int fd, 
  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 *, 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 *);

diff --cc pack-write.c
Simple merge