Merge branch 'jk/sha1write-void'

Code clean-up.

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

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index dfb4d84caa506cee874fd972bc0e9df1a4121362..541667f1026d7ba62be8e029c31138d5661f65c7 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -737,8 +737,6 @@ static void write_pack_file(void)
                        f = create_tmp_packfile(&pack_tmp_name);
 
                offset = write_pack_header(f, nr_remaining);
-               if (!offset)
-                       die_errno("unable to write pack header");
                nr_written = 0;
                for (; i < nr_objects; i++) {
                        struct object_entry *e = write_order[i];

diff --git a/csum-file.c b/csum-file.c
index 465971c7f303e29bf9501e6968da1ea71b5af76a..b00b215031174a0f8ee3cd3d51c662d3cacc6b00 100644 (file)
--- 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)

diff --git a/csum-file.h b/csum-file.h
index 9dedb038ea9c77a8fadac370e039f1672e948325..bb543d52f108cf1e976ee644e337f5ccec983790 100644 (file)
--- a/csum-file.h
+++ b/csum-file.h
@@ -34,7 +34,7 @@ extern struct sha1file *sha1fd(int fd, const char *name);
 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 *, const void *, unsigned int);
 extern void sha1flush(struct sha1file *f);
 extern void crc32_begin(struct sha1file *);
 extern uint32_t crc32_end(struct sha1file *);

diff --git a/pack-write.c b/pack-write.c
index ddc174e1adb9e1545b2815d8a1990e43f6fa2bfb..605d01b25cbd9d796810f8aa810894a2c198da28 100644 (file)
--- a/pack-write.c
+++ b/pack-write.c
@@ -183,8 +183,7 @@ off_t write_pack_header(struct sha1file *f, uint32_t nr_entries)
        hdr.hdr_signature = htonl(PACK_SIGNATURE);
        hdr.hdr_version = htonl(PACK_VERSION);
        hdr.hdr_entries = htonl(nr_entries);
-       if (sha1write(f, &hdr, sizeof(hdr)))
-               return 0;
+       sha1write(f, &hdr, sizeof(hdr));
        return sizeof(hdr);
 }