[PATCH 3/5] read_cache_from(): small simplification
From: Luiz Fernando N. Capitulino <hidden>
Date: 2016-06-15 22:43:07
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- read-cache.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index d2f332a..24e5581 100644
--- a/read-cache.c
+++ b/read-cache.c@@ -856,15 +856,15 @@ int read_cache_from(const char *path) die("index file open failed (%s)", strerror(errno)); } - if (!fstat(fd, &st)) { - cache_mmap_size = xsize_t(st.st_size); - errno = EINVAL; - if (cache_mmap_size >= sizeof(struct cache_header) + 20) - cache_mmap = xmmap(NULL, cache_mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); - else - die("index file smaller than expected"); - } else + if (fstat(fd, &st)) die("cannot stat the open index (%s)", strerror(errno)); + + errno = EINVAL; + cache_mmap_size = xsize_t(st.st_size); + if (cache_mmap_size < sizeof(struct cache_header) + 20) + die("index file smaller than expected"); + + cache_mmap = xmmap(NULL, cache_mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); close(fd); hdr = cache_mmap;
--
1.5.1.1.320.g1cf2