# [PATCH] Cleanup read_cache_from error handling. 1 messages from 2006-12-26 to 2006-12-26. Participants: Shawn O. Pearce. Thread: https://gitlist.dev/t/6113 ## Shawn O. Pearce, 2006-12-26 04:40 Subject: [PATCH] Cleanup read_cache_from error handling. Message-ID: <20061226044058.GA28359@spearce.org> URL: https://gitlist.dev/e/20061226044058.GA28359%40spearce.org ``` When I converted the mmap() call to xmmap() I failed to cleanup the way this routine handles errors and left some crufty code behind. This is a small cleanup, suggested by Johannes. Signed-off-by: Shawn O. Pearce --- This is on top of my sp/mmap topic. read-cache.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/read-cache.c b/read-cache.c index ca3efbb..29cf9ab 100644 --- a/read-cache.c +++ b/read-cache.c @@ -793,16 +793,16 @@ int read_cache_from(const char *path) die("index file open failed (%s)", strerror(errno)); } - cache_mmap = MAP_FAILED; if (!fstat(fd, &st)) { cache_mmap_size = 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 + die("cannot stat the open index (%s)", strerror(errno)); close(fd); - if (cache_mmap == MAP_FAILED) - die("index file mmap failed (%s)", strerror(errno)); hdr = cache_mmap; if (verify_hdr(hdr, cache_mmap_size) < 0) -- 1.4.4.3.gd2e4 ```