From e4dd26960947f6a332d32bea655dc4e7d63fe012 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 2 Oct 2014 19:18:58 +0200 Subject: input/file: make variables more local --- src/input/plugins/FileInputPlugin.cxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/input/plugins') diff --git a/src/input/plugins/FileInputPlugin.cxx b/src/input/plugins/FileInputPlugin.cxx index 8dd114999..525786b5d 100644 --- a/src/input/plugins/FileInputPlugin.cxx +++ b/src/input/plugins/FileInputPlugin.cxx @@ -65,13 +65,10 @@ input_file_open(const char *filename, Mutex &mutex, Cond &cond, Error &error) { - int fd, ret; - struct stat st; - if (!PathTraitsFS::IsAbsolute(filename)) 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 (errno != ENOENT && errno != ENOTDIR) error.FormatErrno("Failed to open \"%s\"", @@ -79,8 +76,8 @@ input_file_open(const char *filename, return nullptr; } - ret = fstat(fd, &st); - if (ret < 0) { + struct stat st; + if (fstat(fd, &st) < 0) { error.FormatErrno("Failed to stat \"%s\"", filename); close(fd); return nullptr; -- cgit v1.2.3