Merge branch 'jk/maint-strbuf-missing-init' into maint
[gitweb.git] / builtin / fsck.c
index 795aba087fe9c6ce0e644526d662a561b7f13f31..df1a88b51ae7773a15276d144113c0002fddb1cd 100644 (file)
@@ -140,11 +140,10 @@ static int traverse_reachable(void)
        int result = 0;
        while (pending.nr) {
                struct object_array_entry *entry;
-               struct object *obj, *parent;
+               struct object *obj;
 
                entry = pending.objects + --pending.nr;
                obj = entry->item;
-               parent = (struct object *) entry->name;
                result |= traverse_one_object(obj);
        }
        return !!result;
@@ -232,12 +231,9 @@ static void check_unreachable_object(struct object *obj)
                                unsigned long size;
                                char *buf = read_sha1_file(obj->sha1,
                                                &type, &size);
-                               if (buf) {
-                                       if (fwrite(buf, size, 1, f) != 1)
-                                               die_errno("Could not write '%s'",
-                                                         filename);
-                                       free(buf);
-                               }
+                               if (buf && fwrite(buf, 1, size, f) != size)
+                                       die_errno("Could not write '%s'", filename);
+                               free(buf);
                        } else
                                fprintf(f, "%s\n", sha1_to_hex(obj->sha1));
                        if (fclose(f))