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

Merge branch 'nd/index-errno' into maint-1.7.11

Browse Source 
* nd/index-errno:
  read_index_from: remove bogus errno assignments
This commit is contained in:
Junio C Hamano 2012-09-11 10:53:21 -07:00
commit d8ce800531
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
read-cache.c
View File

@ -1409,11 +1409,9 @@ int read_index_from(struct index_state *istate, const char *path)
size_t mmap_size; size_t mmap_size;
struct strbuf previous_name_buf = STRBUF_INIT, *previous_name; struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
errno = EBUSY;
if (istate->initialized) if (istate->initialized)
return istate->cache_nr; return istate->cache_nr;
errno = ENOENT;
istate->timestamp.sec = 0; istate->timestamp.sec = 0;
istate->timestamp.nsec = 0; istate->timestamp.nsec = 0;
fd = open(path, O_RDONLY); fd = open(path, O_RDONLY);
@ -1426,15 +1424,14 @@ int read_index_from(struct index_state *istate, const char *path)
if (fstat(fd, &st)) if (fstat(fd, &st))
die_errno("cannot stat the open index"); die_errno("cannot stat the open index");
errno = EINVAL;
mmap_size = xsize_t(st.st_size); mmap_size = xsize_t(st.st_size);
if (mmap_size < sizeof(struct cache_header) + 20) if (mmap_size < sizeof(struct cache_header) + 20)
die("index file smaller than expected"); die("index file smaller than expected");
mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
close(fd);
if (mmap == MAP_FAILED) if (mmap == MAP_FAILED)
die_errno("unable to map index file"); die_errno("unable to map index file");
close(fd);
hdr = mmap; hdr = mmap;
if (verify_hdr(hdr, mmap_size) < 0) if (verify_hdr(hdr, mmap_size) < 0)
@ -1490,7 +1487,6 @@ int read_index_from(struct index_state *istate, const char *path)
unmap: unmap:
munmap(mmap, mmap_size); munmap(mmap, mmap_size);
errno = EINVAL;
die("index file corrupt"); die("index file corrupt");
} }