From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Jan 2014 18:33:09 +0000 (-0800)
Subject: Merge branch 'jk/sha1write-void'
X-Git-Tag: v1.9-rc0~31
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f06a5e607dde266884db4a99b70fbee09d5c5efc

Merge branch 'jk/sha1write-void'

Code clean-up.

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

f06a5e607dde266884db4a99b70fbee09d5c5efc
diff --cc csum-file.c
index 465971c7f3,b30e4f2894..b00b215031
--- a/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 9dedb038ea,6a55c7d729..bb543d52f1
--- a/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 *);