summaryrefslogtreecommitdiff
path: root/csum-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-10 10:33:09 -0800
committerJunio C Hamano <gitster@pobox.com>2014-01-10 10:33:09 -0800
commitf06a5e607dde266884db4a99b70fbee09d5c5efc (patch)
tree76f4f796e45646182ffce1146b6a1017fcfd7320 /csum-file.c
parent4ba46c28471b94de561d00f8b01da79b59527c62 (diff)
parent9af270e8c2a02afd9a3262a2c9312ee7fefbb7a3 (diff)
downloadgit-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.c')
-rw-r--r--csum-file.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/csum-file.c b/csum-file.c
index 465971c7f3..b00b215031 100644
--- 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)