read_index_from: remove bogus errno assignments
These assignments comes from the very first commit e83c516 (Initial revision of "git", the information manager from hell - 2005-04-07). Back then we did not die() when errors happened so correct errno was required. Since 5d1a5c0 ([PATCH] Better error reporting for "git status" - 2005-10-01), read_index_from() learned to die rather than just return -1 and these assignments became irrelevant. Remove them. While at it, move die_errno() next to xmmap() call because it's the mmap's error code that we care about. Otherwise if close(fd); fails, it could overwrite mmap's errno. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Aug 6, 2012 at 18:27 UTC
57d84f8d93a0e0818fc403c5b1a2ba73ce0eca5a
1 file changed
+1
-5
read-cache.c
+1
-5
@@ -1274,11 +1274,9 @@ int read_index_from(struct index_state *istate, const char *path)
1274
void *mmap;
1275
size_t mmap_size;
1276
1277
- errno = EBUSY;
1277
if (istate->initialized)
1278
return istate->cache_nr;
1279
1281
- errno = ENOENT;
1280
istate->timestamp.sec = 0;
1281
istate->timestamp.nsec = 0;
1282
fd = open(path, O_RDONLY);
@@ -1291,15 +1289,14 @@ int read_index_from(struct index_state *istate, const char *path)
1289
if (fstat(fd, &st))
1290
die_errno("cannot stat the open index");
1291
1294
- errno = EINVAL;
1292
mmap_size = xsize_t(st.st_size);
1293
if (mmap_size < sizeof(struct cache_header) + 20)
1294
die("index file smaller than expected");
1295
1296
mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
1300
- close(fd);
1297
if (mmap == MAP_FAILED)
1298
die_errno("unable to map index file");
1299
+ close(fd);
1300
1301
hdr = mmap;
1302
if (verify_hdr(hdr, mmap_size) < 0)
@@ -1358,7 +1355,6 @@ int read_index_from(struct index_state *istate, const char *path)
1355
1356
unmap:
1357
munmap(mmap, mmap_size);
1361
- errno = EINVAL;
1358
die("index file corrupt");
1359
}
1360