From 4e61b2214d333a47ec56eb0806be1774f7ac1b7d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 26 Dec 2019 10:42:20 +0000 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- packfile.c | 5 ++--- 1 file 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)