From 4a62c710b62a5a3c7a8a278b810b9d5b5a0c8f4f Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 28 Nov 2014 19:57:32 +0100 Subject: treewide: another round of simplifications Using the same scripts as in f647962d64e "treewide: yet more log_*_errno + return simplifications". --- src/journal-remote/journal-remote.c | 18 ++++++------------ src/journal-remote/journal-upload.c | 6 ++---- 2 files changed, 8 insertions(+), 16 deletions(-) (limited to 'src/journal-remote') diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 06a39920e4..a5d40cb718 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -84,10 +84,8 @@ static int spawn_child(const char* child, char** argv) { pid_t parent_pid, child_pid; int r; - if (pipe(fd) < 0) { - log_error_errno(errno, "Failed to create pager pipe: %m"); - return -errno; - } + if (pipe(fd) < 0) + return log_error_errno(errno, "Failed to create pager pipe: %m"); parent_pid = getpid(); @@ -940,10 +938,8 @@ static int remoteserver_init(RemoteServer *s, log_info("Reading file %s...", *file); fd = open(*file, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NONBLOCK); - if (fd < 0) { - log_error_errno(errno, "Failed to open %s: %m", *file); - return -errno; - } + if (fd < 0) + return log_error_errno(errno, "Failed to open %s: %m", *file); output_name = *file; } @@ -1053,10 +1049,8 @@ static int accept_connection(const char* type, int fd, log_debug("Accepting new %s connection on fd:%d", type, fd); fd2 = accept4(fd, &addr->sockaddr.sa, &addr->size, SOCK_NONBLOCK|SOCK_CLOEXEC); - if (fd2 < 0) { - log_error_errno(errno, "accept() on fd:%d failed: %m", fd); - return -errno; - } + if (fd2 < 0) + return log_error_errno(errno, "accept() on fd:%d failed: %m", fd); switch(socket_address_family(addr)) { case AF_INET: diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 826e41a1c4..8be0f93b7c 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -357,10 +357,8 @@ static int open_file_for_upload(Uploader *u, const char *filename) { fd = STDIN_FILENO; else { fd = open(filename, O_RDONLY|O_CLOEXEC|O_NOCTTY); - if (fd < 0) { - log_error_errno(errno, "Failed to open %s: %m", filename); - return -errno; - } + if (fd < 0) + return log_error_errno(errno, "Failed to open %s: %m", filename); } u->input = fd; -- cgit v1.2.3-54-g00ecf