use xopen() to handle fatal open(2) failures
Add and apply a semantic patch for using xopen() instead of calling open(2) and die() or die_errno() explicitly. This makes the error messages more consistent and shortens the code. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
a7439d0f9d
commit
66e905b7dd
@ -338,15 +338,11 @@ static const char *open_pack_file(const char *pack_name)
|
||||
"pack/tmp_pack_XXXXXX");
|
||||
pack_name = strbuf_detach(&tmp_file, NULL);
|
||||
} else {
|
||||
output_fd = open(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600);
|
||||
if (output_fd < 0)
|
||||
die_errno(_("unable to create '%s'"), pack_name);
|
||||
output_fd = xopen(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600);
|
||||
}
|
||||
nothread_data.pack_fd = output_fd;
|
||||
} else {
|
||||
input_fd = open(pack_name, O_RDONLY);
|
||||
if (input_fd < 0)
|
||||
die_errno(_("cannot open packfile '%s'"), pack_name);
|
||||
input_fd = xopen(pack_name, O_RDONLY);
|
||||
output_fd = -1;
|
||||
nothread_data.pack_fd = input_fd;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user