Merge branch 'ds/use-get-be64'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Feb 2018 21:39:11 +0000 (13:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Feb 2018 21:39:11 +0000 (13:39 -0800)
Code clean-up.

* ds/use-get-be64:
packfile: use get_be64() for large offsets

pack-revindex.c
packfile.c
index 1b7ebd8d7eefbcc646867db3e52536b4aac42208..ff5f62c03326a7f01926c72a19be5029ae4c1a8b 100644 (file)
@@ -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;
                }
index 2d5774dbc0901895b4dfc0d66cc03d3c253a3e95..7dbe8739d17d64fad79eac9e7477d00ea3d80df2 100644 (file)
@@ -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);
        }
 }