diff options
| author | Eric Wong <e@80x24.org> | 2019-12-26 10:42:20 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-26 11:57:46 -0800 |
| commit | 4e61b2214d333a47ec56eb0806be1774f7ac1b7d (patch) | |
| tree | ab2b5a7e1003c35757865432b2632e9427d169f7 | |
| parent | packfile: remove redundant fcntl F_GETFD/F_SETFD (diff) | |
| download | git-4e61b2214d333a47ec56eb0806be1774f7ac1b7d.tar.gz git-4e61b2214d333a47ec56eb0806be1774f7ac1b7d.zip | |
packfile: replace lseek+read with pread
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>
Diffstat (limited to '')
| -rw-r--r-- | packfile.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packfile.c b/packfile.c index 518d9d5b54..fdb33fda81 100644 --- a/packfile.c +++ b/packfile.c @@ -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) |