Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
packfile: convert unpack_entry to struct object_id
author
brian m. carlson
<sandals@crustytoothpaste.net>
Mon, 12 Mar 2018 02:27:44 +0000
(
02:27
+0000)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 14 Mar 2018 16:23:49 +0000
(09:23 -0700)
Convert unpack_entry and read_object to use struct object_id.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
packfile.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
d169d66
)
diff --git
a/packfile.c
b/packfile.c
index 5f08aa0a145829d23421b681c5f83de49ea1bc3c..3e31ad7a0c9be11ffc76c7ccb0840399b345d88f 100644
(file)
--- a/
packfile.c
+++ b/
packfile.c
@@
-1452,7
+1452,7
@@
struct unpack_entry_stack_ent {
unsigned long size;
};
unsigned long size;
};
-static void *read_object(const
unsigned char *sha1
, enum object_type *type,
+static void *read_object(const
struct object_id *oid
, enum object_type *type,
unsigned long *size)
{
struct object_info oi = OBJECT_INFO_INIT;
unsigned long *size)
{
struct object_info oi = OBJECT_INFO_INIT;
@@
-1461,7
+1461,7
@@
static void *read_object(const unsigned char *sha1, enum object_type *type,
oi.sizep = size;
oi.contentp = &content;
oi.sizep = size;
oi.contentp = &content;
- if (sha1_object_info_extended(
sha1
, &oi, 0) < 0)
+ if (sha1_object_info_extended(
oid->hash
, &oi, 0) < 0)
return NULL;
return content;
}
return NULL;
return content;
}
@@
-1501,11
+1501,11
@@
void *unpack_entry(struct packed_git *p, off_t obj_offset,
struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
off_t len = revidx[1].offset - obj_offset;
if (check_pack_crc(p, &w_curs, obj_offset, len, revidx->nr)) {
struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
off_t len = revidx[1].offset - obj_offset;
if (check_pack_crc(p, &w_curs, obj_offset, len, revidx->nr)) {
- const unsigned char *sha1 =
-
nth_packed_object_sha1(
p, revidx->nr);
+ struct object_id oid;
+
nth_packed_object_oid(&oid,
p, revidx->nr);
error("bad packed object CRC for %s",
error("bad packed object CRC for %s",
-
sha1_to_hex(sha1
));
- mark_bad_packed_object(p,
sha1
);
+
oid_to_hex(&oid
));
+ mark_bad_packed_object(p,
oid.hash
);
data = NULL;
goto out;
}
data = NULL;
goto out;
}
@@
-1588,16
+1588,16
@@
void *unpack_entry(struct packed_git *p, off_t obj_offset,
* of a corrupted pack, and is better than failing outright.
*/
struct revindex_entry *revidx;
* of a corrupted pack, and is better than failing outright.
*/
struct revindex_entry *revidx;
-
const unsigned char *base_sha1
;
+
struct object_id base_oid
;
revidx = find_pack_revindex(p, obj_offset);
if (revidx) {
revidx = find_pack_revindex(p, obj_offset);
if (revidx) {
-
base_sha1 = nth_packed_object_sha1(
p, revidx->nr);
+
nth_packed_object_oid(&base_oid,
p, revidx->nr);
error("failed to read delta base object %s"
" at offset %"PRIuMAX" from %s",
error("failed to read delta base object %s"
" at offset %"PRIuMAX" from %s",
-
sha1_to_hex(base_sha1
), (uintmax_t)obj_offset,
+
oid_to_hex(&base_oid
), (uintmax_t)obj_offset,
p->pack_name);
p->pack_name);
- mark_bad_packed_object(p, base_
sha1
);
- base = read_object(
base_sha1
, &type, &base_size);
+ mark_bad_packed_object(p, base_
oid.hash
);
+ base = read_object(
&base_oid
, &type, &base_size);
external_base = base;
}
}
external_base = base;
}
}