Merge branch 'master' into cc/trace

diff --git a/csum-file.c b/csum-file.c
index 6a7b40fd09ea9aa365d70dc8019f83e481192c07..b7174c6c056c5a8f2a800ecbcb3cdf304c0bfc3f 100644 (file)
--- a/csum-file.c
+++ b/csum-file.c
@@ -10,7 +10,7 @@
 #include "cache.h"
 #include "csum-file.h"
 
-static int sha1flush(struct sha1file *f, unsigned int count)
+static void sha1flush(struct sha1file *f, unsigned int count)
 {
        void *buf = f->buffer;
 
@@ -21,7 +21,7 @@ static int sha1flush(struct sha1file *f, unsigned int count)
                        count -= ret;
                        if (count)
                                continue;
-                       return 0;
+                       return;
                }
                if (!ret)
                        die("sha1 file '%s' write error. Out of diskspace", f->name);
@@ -38,7 +38,7 @@ int sha1close(struct sha1file *f, unsigned char *result, int update)
        }
        SHA1_Final(f->buffer, &f->ctx);
        if (result)
-               memcpy(result, f->buffer, 20);
+               hashcpy(result, f->buffer);
        if (update)
                sha1flush(f, 20);
        if (close(f->fd))