kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jk/simplify-csum-file-sha1fd-check' 

Code simplification.

* jk/simplify-csum-file-sha1fd-check:
  sha1fd_check: die when we cannot open the file
maint
Junio C Hamano 2015-03-25 12:54:19 -07:00
parent 5f15cba2f9 599d223107
commit 09e32fa0f8
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
csum-file.c
View File

@ -130,14 +130,10 @@ struct sha1file *sha1fd_check(const char *name)


sink = open("/dev/null", O_WRONLY); sink = open("/dev/null", O_WRONLY);
if (sink < 0) if (sink < 0)
return NULL; die_errno("unable to open /dev/null");
check = open(name, O_RDONLY); check = open(name, O_RDONLY);
if (check < 0) { if (check < 0)
int saved_errno = errno; die_errno("unable to open '%s'", name);
close(sink);
errno = saved_errno;
return NULL;
}
f = sha1fd(sink, name); f = sha1fd(sink, name);
f->check_fd = check; f->check_fd = check;
return f; return f;