Allow the user to control the verbosity of merge-recursive.

diff --git a/csum-file.h b/csum-file.h
index 1086f04caa228f044cdce0b5f0f63edfbc3bed79..3ad1a992a758fc9339baa2cecc17ac14af359f1b 100644 (file)
--- a/csum-file.h
+++ b/csum-file.h
@@ -4,13 +4,15 @@
 /* A SHA1-protected file */
 struct sha1file {
        int fd, error;
-       unsigned long offset;
+       unsigned int offset, namelen;
        SHA_CTX ctx;
+       char name[PATH_MAX];
        unsigned char buffer[8192];
 };
 
-extern struct sha1file *sha1create(const char *fmt, ...);
-extern int sha1close(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);