Mark the variable declarations in .h files as extern

[git.git] / write-tree.c

diff --git a/write-tree.c b/write-tree.c
index 827809d..d801d7f 100644 (file)
--- a/write-tree.c
+++ b/write-tree.c
@@ -17,32 +17,20 @@ static int check_valid_sha1(unsigned char *sha1)
        return ret;
 }
 
-static int prepend_integer(char *buffer, unsigned val, int i)
-{
-       buffer[--i] = '\0';
-       do {
-               buffer[--i] = '0' + (val % 10);
-               val /= 10;
-       } while (val);
-       return i;
-}
-
-#define ORIG_OFFSET (40)       /* Enough space to add the header of "tree <size>\0" */
-
 static int write_tree(struct cache_entry **cachep, int maxentries, const char *base, int baselen, unsigned char *returnsha1)
 {
        unsigned char subdir_sha1[20];
        unsigned long size, offset;
        char *buffer;
-       int i, nr;
+       int nr;
 
        /* Guess at some random initial size */
        size = 8192;
-       buffer = malloc(size);
-       offset = ORIG_OFFSET;
+       buffer = xmalloc(size);
+       offset = 0;
 
        nr = 0;
-       do {
+       while (nr < maxentries) {
                struct cache_entry *ce = cachep[nr];
                const char *pathname = ce->name, *filename, *dirname;
                int pathlen = ce_namelen(ce), entrylen;
@@ -80,20 +68,16 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
                entrylen = pathlen - baselen;
                if (offset + entrylen + 100 > size) {
                        size = alloc_nr(offset + entrylen + 100);
-                       buffer = realloc(buffer, size);
+                       buffer = xrealloc(buffer, size);
                }
                offset += sprintf(buffer + offset, "%o %.*s", mode, entrylen, filename);
                buffer[offset++] = 0;
                memcpy(buffer + offset, sha1, 20);
                offset += 20;
                nr++;
-       } while (nr < maxentries);
-
-       i = prepend_integer(buffer, offset - ORIG_OFFSET, ORIG_OFFSET);
-       i -= 5;
-       memcpy(buffer+i, "tree ", 5);
+       }
 
-       write_sha1_file(buffer + i, offset - i, returnsha1);
+       write_sha1_file(buffer, offset, "tree", returnsha1);
        free(buffer);
        return nr;
 }
@@ -104,8 +88,8 @@ int main(int argc, char **argv)
        int entries = read_cache();
        unsigned char sha1[20];
 
-       if (entries <= 0)
-               die("write-tree: no cache contents to write");
+       if (entries < 0)
+               die("write-tree: error reading cache");
 
        /* Verify that the tree is merged */
        unmerged = 0;