diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 18:23:20 +0100 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 18:24:30 +0100 |
| commit | 23bbb0de4e3f85d9704a5c12a5afa2dfa0159e41 (patch) | |
| tree | 28e66fb86dd0cffc3a3cca3cf234cb52c3b64ad3 /src/journal-remote/journal-gatewayd.c | |
| parent | 5e03c6e3b517286bbd65b48d88f60e5b83721894 (diff) | |
treewide: more log_*_errno + return simplifications
Diffstat (limited to 'src/journal-remote/journal-gatewayd.c')
| -rw-r--r-- | src/journal-remote/journal-gatewayd.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c index 723b057c1d..d39a2cc67e 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c @@ -909,10 +909,8 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; } r = read_full_file(optarg, &key_pem, NULL); - if (r < 0) { - log_error_errno(r, "Failed to read key file: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to read key file: %m"); assert(key_pem); break; @@ -922,10 +920,8 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; } r = read_full_file(optarg, &cert_pem, NULL); - if (r < 0) { - log_error_errno(r, "Failed to read certificate file: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to read certificate file: %m"); assert(cert_pem); break; @@ -936,10 +932,8 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; } r = read_full_file(optarg, &trust_pem, NULL); - if (r < 0) { - log_error_errno(r, "Failed to read CA certificate file: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to read CA certificate file: %m"); assert(trust_pem); break; #else |