upload-pack: move shallow_nr to upload_pack_data

[thirdparty/git.git] / pack-check.c

diff --git a/pack-check.c b/pack-check.c
index d3a57df34f2d2bf0ef9935a51f171f24d8ed6a72..dad6d8ae7f23541a886e7cc6dc7a6b10dead10fe 100644 (file)
--- a/pack-check.c
+++ b/pack-check.c
@@ -8,10 +8,6 @@
 
 struct idx_entry {
        off_t                offset;
-       union idx_entry_object {
-               const unsigned char *hash;
-               struct object_id *oid;
-       } oid;
        unsigned int nr;
 };
 
@@ -48,7 +44,8 @@ int check_pack_crc(struct packed_git *p, struct pack_window **w_curs,
        return data_crc != ntohl(*index_crc);
 }
 
-static int verify_packfile(struct packed_git *p,
+static int verify_packfile(struct repository *r,
+                          struct packed_git *p,
                           struct pack_window **w_curs,
                           verify_fn fn,
                           struct progress *progress, uint32_t base_count)
@@ -66,23 +63,23 @@ static int verify_packfile(struct packed_git *p,
        if (!is_pack_valid(p))
                return error("packfile %s cannot be accessed", p->pack_name);
 
-       the_hash_algo->init_fn(&ctx);
+       r->hash_algo->init_fn(&ctx);
        do {
                unsigned long remaining;
                unsigned char *in = use_pack(p, w_curs, offset, &remaining);
                offset += remaining;
                if (!pack_sig_ofs)
-                       pack_sig_ofs = p->pack_size - the_hash_algo->rawsz;
+                       pack_sig_ofs = p->pack_size - r->hash_algo->rawsz;
                if (offset > pack_sig_ofs)
                        remaining -= (unsigned int)(offset - pack_sig_ofs);
-               the_hash_algo->update_fn(&ctx, in, remaining);
+               r->hash_algo->update_fn(&ctx, in, remaining);
        } while (offset < pack_sig_ofs);
-       the_hash_algo->final_fn(hash, &ctx);
+       r->hash_algo->final_fn(hash, &ctx);
        pack_sig = use_pack(p, w_curs, pack_sig_ofs, NULL);
-       if (hashcmp(hash, pack_sig))
+       if (!hasheq(hash, pack_sig))
                err = error("%s pack checksum mismatch",
                            p->pack_name);
-       if (hashcmp(index_base + index_size - the_hash_algo->hexsz, pack_sig))
+       if (!hasheq(index_base + index_size - r->hash_algo->hexsz, pack_sig))
                err = error("%s pack checksum does not match its index",
                            p->pack_name);
        unuse_pack(w_curs);
@@ -96,9 +93,6 @@ static int verify_packfile(struct packed_git *p,
        entries[nr_objects].offset = pack_sig_ofs;
        /* first sort entries by pack offset, since unpacking them is more efficient that way */
        for (i = 0; i < nr_objects; i++) {
-               entries[i].oid.hash = nth_packed_object_sha1(p, i);
-               if (!entries[i].oid.hash)
-                       die("internal error pack-check nth-packed-object");
                entries[i].offset = nth_packed_object_offset(p, i);
                entries[i].nr = i;
        }
@@ -106,11 +100,16 @@ static int verify_packfile(struct packed_git *p,
 
        for (i = 0; i < nr_objects; i++) {
                void *data;
+               struct object_id oid;
                enum object_type type;
                unsigned long size;
                off_t curpos;
                int data_valid;
 
+               if (nth_packed_object_id(&oid, p, entries[i].nr) < 0)
+                       BUG("unable to get oid of object %lu from %s",
+                           (unsigned long)entries[i].nr, p->pack_name);
+
                if (p->index_version > 1) {
                        off_t offset = entries[i].offset;
                        off_t len = entries[i+1].offset - offset;
@@ -118,7 +117,7 @@ static int verify_packfile(struct packed_git *p,
                        if (check_pack_crc(p, w_curs, offset, len, nr))
                                err = error("index CRC mismatch for object %s "
                                            "from %s at offset %"PRIuMAX"",
-                                           oid_to_hex(entries[i].oid.oid),
+                                           oid_to_hex(&oid),
                                            p->pack_name, (uintmax_t)offset);
                }
 
@@ -135,20 +134,20 @@ static int verify_packfile(struct packed_git *p,
                        data = NULL;
                        data_valid = 0;
                } else {
-                       data = unpack_entry(the_repository, p, entries[i].offset, &type, &size);
+                       data = unpack_entry(r, p, entries[i].offset, &type, &size);
                        data_valid = 1;
                }
 
                if (data_valid && !data)
                        err = error("cannot unpack %s from %s at offset %"PRIuMAX"",
-                                   oid_to_hex(entries[i].oid.oid), p->pack_name,
+                                   oid_to_hex(&oid), p->pack_name,
                                    (uintmax_t)entries[i].offset);
-               else if (check_object_signature(entries[i].oid.oid, data, size, type_name(type)))
+               else if (check_object_signature(r, &oid, data, size, type_name(type)))
                        err = error("packed %s from %s is corrupt",
-                                   oid_to_hex(entries[i].oid.oid), p->pack_name);
+                                   oid_to_hex(&oid), p->pack_name);
                else if (fn) {
                        int eaten = 0;
-                       err |= fn(entries[i].oid.oid, type, size, data, &eaten);
+                       err |= fn(&oid, type, size, data, &eaten);
                        if (eaten)
                                data = NULL;
                }
@@ -180,13 +179,13 @@ int verify_pack_index(struct packed_git *p)
        the_hash_algo->init_fn(&ctx);
        the_hash_algo->update_fn(&ctx, index_base, (unsigned int)(index_size - the_hash_algo->rawsz));
        the_hash_algo->final_fn(hash, &ctx);
-       if (hashcmp(hash, index_base + index_size - the_hash_algo->rawsz))
+       if (!hasheq(hash, index_base + index_size - the_hash_algo->rawsz))
                err = error("Packfile index for %s hash mismatch",
                            p->pack_name);
        return err;
 }
 
-int verify_pack(struct packed_git *p, verify_fn fn,
+int verify_pack(struct repository *r, struct packed_git *p, verify_fn fn,
                struct progress *progress, uint32_t base_count)
 {
        int err = 0;
@@ -196,7 +195,7 @@ int verify_pack(struct packed_git *p, verify_fn fn,
        if (!p->index_data)
                return -1;
 
-       err |= verify_packfile(p, &w_curs, fn, progress, base_count);
+       err |= verify_packfile(r, p, &w_curs, fn, progress, base_count);
        unuse_pack(&w_curs);
 
        return err;