Commit e4dd2696 authored by Max Kellermann's avatar Max Kellermann

input/file: make variables more local

parent 19dd59f3
...@@ -65,13 +65,10 @@ input_file_open(const char *filename, ...@@ -65,13 +65,10 @@ input_file_open(const char *filename,
Mutex &mutex, Cond &cond, Mutex &mutex, Cond &cond,
Error &error) Error &error)
{ {
int fd, ret;
struct stat st;
if (!PathTraitsFS::IsAbsolute(filename)) if (!PathTraitsFS::IsAbsolute(filename))
return nullptr; return nullptr;
fd = open_cloexec(filename, O_RDONLY|O_BINARY, 0); const int fd = open_cloexec(filename, O_RDONLY|O_BINARY, 0);
if (fd < 0) { if (fd < 0) {
if (errno != ENOENT && errno != ENOTDIR) if (errno != ENOENT && errno != ENOTDIR)
error.FormatErrno("Failed to open \"%s\"", error.FormatErrno("Failed to open \"%s\"",
...@@ -79,8 +76,8 @@ input_file_open(const char *filename, ...@@ -79,8 +76,8 @@ input_file_open(const char *filename,
return nullptr; return nullptr;
} }
ret = fstat(fd, &st); struct stat st;
if (ret < 0) { if (fstat(fd, &st) < 0) {
error.FormatErrno("Failed to stat \"%s\"", filename); error.FormatErrno("Failed to stat \"%s\"", filename);
close(fd); close(fd);
return nullptr; return nullptr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment