Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i'

diff --git a/csum-file.c b/csum-file.c
index 465971c7f303e29bf9501e6968da1ea71b5af76a..b00b215031174a0f8ee3cd3d51c662d3cacc6b00 100644 (file)
--- a/csum-file.c
+++ b/csum-file.c
@@ -86,7 +86,7 @@ int sha1close(struct sha1file *f, unsigned char *result, unsigned int flags)
        return fd;
 }
 
-int sha1write(struct sha1file *f, const void *buf, unsigned int count)
+void sha1write(struct sha1file *f, const void *buf, unsigned int count)
 {
        while (count) {
                unsigned offset = f->offset;
@@ -116,7 +116,6 @@ int sha1write(struct sha1file *f, const void *buf, unsigned int count)
                }
                f->offset = offset;
        }
-       return 0;
 }
 
 struct sha1file *sha1fd(int fd, const char *name)