diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-13 13:39:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-13 13:39:11 -0800 |
| commit | 2dc69eef1b92aab539164a098558c8f51a12f36f (patch) | |
| tree | d350f3f5f067fa209127456f5db156f6c742f546 | |
| parent | Merge branch 'cc/sha1-file-name' (diff) | |
| parent | packfile: use get_be64() for large offsets (diff) | |
| download | git-2dc69eef1b92aab539164a098558c8f51a12f36f.tar.gz git-2dc69eef1b92aab539164a098558c8f51a12f36f.zip | |
Merge branch 'ds/use-get-be64'
Code clean-up.
* ds/use-get-be64:
packfile: use get_be64() for large offsets
| -rw-r--r-- | pack-revindex.c | 6 | ||||
| -rw-r--r-- | packfile.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pack-revindex.c b/pack-revindex.c index 1b7ebd8d7e..ff5f62c033 100644 --- a/pack-revindex.c +++ b/pack-revindex.c @@ -134,10 +134,8 @@ static void create_pack_revindex(struct packed_git *p) if (!(off & 0x80000000)) { p->revindex[i].offset = off; } else { - p->revindex[i].offset = - ((uint64_t)ntohl(*off_64++)) << 32; - p->revindex[i].offset |= - ntohl(*off_64++); + p->revindex[i].offset = get_be64(off_64); + off_64 += 2; } p->revindex[i].nr = i; } diff --git a/packfile.c b/packfile.c index 2d5774dbc0..7dbe8739d1 100644 --- a/packfile.c +++ b/packfile.c @@ -1713,8 +1713,7 @@ off_t nth_packed_object_offset(const struct packed_git *p, uint32_t n) return off; index += p->num_objects * 4 + (off & 0x7fffffff) * 8; check_pack_index_ptr(p, index); - return (((uint64_t)ntohl(*((uint32_t *)(index + 0)))) << 32) | - ntohl(*((uint32_t *)(index + 4))); + return get_be64(index); } } |