Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/csum-file.h b/csum-file.h
index 7e1339189dcdc6e271fad5df7ad427954642ae9e..c3c792f1b56026b6a4d9d10b6ba63947c7f383cf 100644 (file)
--- a/csum-file.h
+++ b/csum-file.h
@@ -13,10 +13,8 @@ struct sha1file {
 };
 
 extern struct sha1file *sha1fd(int fd, const char *name);
-extern struct sha1file *sha1create(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
 extern int sha1close(struct sha1file *, unsigned char *, int);
 extern int sha1write(struct sha1file *, void *, unsigned int);
-extern int sha1write_compressed(struct sha1file *, void *, unsigned int);
 extern void crc32_begin(struct sha1file *);
 extern uint32_t crc32_end(struct sha1file *);