undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read_cache_from(): small simplification

Browse Source 
This change 'opens' the code block which maps the index file into
memory, making the code clearer and easier to read.

Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Luiz Fernando N. Capitulino 2007-04-25 11:18:17 -03:00 committed by Junio C Hamano
parent efbc583126
commit 3511a3774e
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
read-cache.c
View File

@ -864,16 +864,15 @@ int read_index_from(struct index_state *istate, const char *path)
die("index file open failed (%s)", strerror(errno)); die("index file open failed (%s)", strerror(errno));
} }
if (!fstat(fd, &st)) { if (fstat(fd, &st))
istate->mmap_size = xsize_t(st.st_size);
errno = EINVAL;
if (istate->mmap_size >= sizeof(struct cache_header) + 20)
istate->mmap = xmmap(NULL, istate->mmap_size,
PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
else
die("index file smaller than expected");
} else
die("cannot stat the open index (%s)", strerror(errno)); die("cannot stat the open index (%s)", strerror(errno));
errno = EINVAL;
istate->mmap_size = xsize_t(st.st_size);
if (istate->mmap_size < sizeof(struct cache_header) + 20)
die("index file smaller than expected");
istate->mmap = xmmap(NULL, istate->mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
close(fd); close(fd);
hdr = istate->mmap; hdr = istate->mmap;