]> git.ipfire.org Git - thirdparty/git.git/commitdiff
packfile: replace lseek+read with pread
authorEric Wong <e@80x24.org>
Thu, 26 Dec 2019 10:42:20 +0000 (10:42 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Dec 2019 19:57:46 +0000 (11:57 -0800)
We already have pread emulation for portability, so there's
there's no reason to make two syscalls where one suffices.

Furthermore, readers of the packfile will be using mmap
(or pread to emulate mmap), anyways, so the file description
offset does not matter in this case.

Signed-off-by: Eric Wong <e@80x24.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
packfile.c

index 518d9d5b54c58c9733ebb824c1673e09dbba4656..fdb33fda818574749dbaeb29071e964d479a0ade 100644 (file)
@@ -555,9 +555,8 @@ static int open_packed_git_1(struct packed_git *p)
                             " while index indicates %"PRIu32" objects",
                             p->pack_name, ntohl(hdr.hdr_entries),
                             p->num_objects);
-       if (lseek(p->pack_fd, p->pack_size - hashsz, SEEK_SET) == -1)
-               return error("end of packfile %s is unavailable", p->pack_name);
-       read_result = read_in_full(p->pack_fd, hash, hashsz);
+       read_result = pread_in_full(p->pack_fd, hash, hashsz,
+                                       p->pack_size - hashsz);
        if (read_result < 0)
                return error_errno("error reading from %s", p->pack_name);
        if (read_result != hashsz)