chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: simplify log_*_errno(r,...) immediately followed by "return r"
[elogind.git]
/
src
/
journal-remote
/
journal-remote.c
diff --git
a/src/journal-remote/journal-remote.c
b/src/journal-remote/journal-remote.c
index 89a680dcb77d98304562ec21add36d4350181a26..21309743fe108cf12f40bb44e020055f28652916 100644
(file)
--- a/
src/journal-remote/journal-remote.c
+++ b/
src/journal-remote/journal-remote.c
@@
-210,8
+210,8
@@
static int open_output(Writer *w, const char* host) {
w->mmap,
NULL, &w->journal);
if (r < 0)
w->mmap,
NULL, &w->journal);
if (r < 0)
- log_error
("Failed to open output journal %s: %s
",
-
output, strerror(-r)
);
+ log_error
_errno(r, "Failed to open output journal %s: %m
",
+
output
);
else
log_info("Opened output file %s", w->journal->path);
return r;
else
log_info("Opened output file %s", w->journal->path);
return r;
@@
-320,11
+320,9
@@
static int get_source_for_fd(RemoteServer *s,
return log_oom();
r = get_writer(s, name, &writer);
return log_oom();
r = get_writer(s, name, &writer);
- if (r < 0) {
- log_warning("Failed to get writer for source %s: %s",
- name, strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_warning_errno(r, "Failed to get writer for source %s: %m",
+ name);
if (s->sources[fd] == NULL) {
s->sources[fd] = source_new(fd, false, name, writer);
if (s->sources[fd] == NULL) {
s->sources[fd] = source_new(fd, false, name, writer);
@@
-376,8
+374,8
@@
static int add_source(RemoteServer *s, int fd, char* name, bool own_name) {
r = get_source_for_fd(s, fd, name, &source);
if (r < 0) {
r = get_source_for_fd(s, fd, name, &source);
if (r < 0) {
- log_error
("Failed to create source for fd:%d (%s): %s
",
-
fd, name, strerror(-r)
);
+ log_error
_errno(r, "Failed to create source for fd:%d (%s): %m
",
+
fd, name
);
free(name);
return r;
}
free(name);
return r;
}
@@
-393,8
+391,8
@@
static int add_source(RemoteServer *s, int fd, char* name, bool own_name) {
sd_event_source_set_enabled(source->event, SD_EVENT_ON);
}
if (r < 0) {
sd_event_source_set_enabled(source->event, SD_EVENT_ON);
}
if (r < 0) {
- log_error
("Failed to register event source for fd:%d: %s
",
-
fd, strerror(-r)
);
+ log_error
_errno(r, "Failed to register event source for fd:%d: %m
",
+
fd
);
goto error;
}
goto error;
}
@@
-459,11
+457,9
@@
static int request_meta(void **connection_cls, int fd, char *hostname) {
return 0;
r = get_writer(server, hostname, &writer);
return 0;
r = get_writer(server, hostname, &writer);
- if (r < 0) {
- log_warning("Failed to get writer for source %s: %s",
- hostname, strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_warning_errno(r, "Failed to get writer for source %s: %m",
+ hostname);
source = source_new(fd, true, hostname, writer);
if (!source) {
source = source_new(fd, true, hostname, writer);
if (!source) {
@@
-855,11
+851,9
@@
static int remoteserver_init(RemoteServer *s,
return r;
n = sd_listen_fds(true);
return r;
n = sd_listen_fds(true);
- if (n < 0) {
- log_error("Failed to read listening file descriptors from environment: %s",
- strerror(-n));
- return n;
- } else
+ if (n < 0)
+ return log_error_errno(n, "Failed to read listening file descriptors from environment: %m");
+ else
log_info("Received %d descriptors", n);
if (MAX(http_socket, https_socket) >= SD_LISTEN_FDS_START + n) {
log_info("Received %d descriptors", n);
if (MAX(http_socket, https_socket) >= SD_LISTEN_FDS_START + n) {
@@
-896,8
+890,8
@@
static int remoteserver_init(RemoteServer *s,
}
if(r < 0) {
}
if(r < 0) {
- log_error
("Failed to register socket (fd:%d): %s
",
-
fd, strerror(-r)
);
+ log_error
_errno(r, "Failed to register socket (fd:%d): %m
",
+
fd
);
return r;
}
}
return r;
}
}
@@
-1461,28
+1455,22
@@
static int load_certificates(char **key, char **cert, char **trust) {
int r;
r = read_full_file(arg_key ?: PRIV_KEY_FILE, key, NULL);
int r;
r = read_full_file(arg_key ?: PRIV_KEY_FILE, key, NULL);
- if (r < 0) {
- log_error("Failed to read key from file '%s': %s",
- arg_key ?: PRIV_KEY_FILE, strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to read key from file '%s': %m",
+ arg_key ?: PRIV_KEY_FILE);
r = read_full_file(arg_cert ?: CERT_FILE, cert, NULL);
r = read_full_file(arg_cert ?: CERT_FILE, cert, NULL);
- if (r < 0) {
- log_error("Failed to read certificate from file '%s': %s",
- arg_cert ?: CERT_FILE, strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to read certificate from file '%s': %m",
+ arg_cert ?: CERT_FILE);
if (arg_trust_all)
log_info("Certificate checking disabled.");
else {
r = read_full_file(arg_trust ?: TRUST_FILE, trust, NULL);
if (arg_trust_all)
log_info("Certificate checking disabled.");
else {
r = read_full_file(arg_trust ?: TRUST_FILE, trust, NULL);
- if (r < 0) {
- log_error("Failed to read CA certificate file '%s': %s",
- arg_trust ?: TRUST_FILE, strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to read CA certificate file '%s': %m",
+ arg_trust ?: TRUST_FILE);
}
return 0;
}
return 0;