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 03410c7925ddb4334c73860d3d73d0f9185fb87e..21309743fe108cf12f40bb44e020055f28652916 100644
(file)
--- a/
src/journal-remote/journal-remote.c
+++ b/
src/journal-remote/journal-remote.c
@@
-149,15
+149,15
@@
static int spawn_getter(const char *getter, const char *url) {
_cleanup_strv_free_ char **words = NULL;
assert(getter);
_cleanup_strv_free_ char **words = NULL;
assert(getter);
- r = strv_split_quoted(&words, getter);
+ r = strv_split_quoted(&words, getter
, false
);
if (r < 0) {
if (r < 0) {
- log_error
("Failed to split getter option: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to split getter option: %m"
);
return r;
}
r = strv_extend(&words, url);
if (r < 0) {
return r;
}
r = strv_extend(&words, url);
if (r < 0) {
- log_error
("Failed to create command line: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to create command line: %m"
);
return r;
}
return r;
}
@@
-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,14
+391,14
@@
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;
}
r = sd_event_source_set_description(source->event, name);
if (r < 0) {
goto error;
}
r = sd_event_source_set_description(source->event, name);
if (r < 0) {
- log_error
("Failed to set source name for fd:%d: %s", fd, strerror(-r)
);
+ log_error
_errno(r, "Failed to set source name 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) {
@@
-662,7
+658,7
@@
static int setup_microhttpd_server(RemoteServer *s,
r = fd_nonblock(fd, true);
if (r < 0) {
r = fd_nonblock(fd, true);
if (r < 0) {
- log_error
("Failed to make fd:%d nonblocking: %s", fd, strerror(-r)
);
+ log_error
_errno(r, "Failed to make fd:%d nonblocking: %m", fd
);
return r;
}
return r;
}
@@
-720,13
+716,13
@@
static int setup_microhttpd_server(RemoteServer *s,
epoll_fd, EPOLLIN,
dispatch_http_event, d);
if (r < 0) {
epoll_fd, EPOLLIN,
dispatch_http_event, d);
if (r < 0) {
- log_error
("Failed to add event callback: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to add event callback: %m"
);
goto error;
}
r = sd_event_source_set_description(d->event, "epoll-fd");
if (r < 0) {
goto error;
}
r = sd_event_source_set_description(d->event, "epoll-fd");
if (r < 0) {
- log_error
("Failed to set source name: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to set source name: %m"
);
goto error;
}
goto error;
}
@@
-738,7
+734,7
@@
static int setup_microhttpd_server(RemoteServer *s,
r = hashmap_put(s->daemons, &d->fd, d);
if (r < 0) {
r = hashmap_put(s->daemons, &d->fd, d);
if (r < 0) {
- log_error
("Failed to add daemon to hashmap: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to add daemon to hashmap: %m"
);
goto error;
}
goto error;
}
@@
-803,18
+799,10
@@
static int setup_signals(RemoteServer *s) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_event_source_set_description(s->sigterm_event, "sigterm");
- if (r < 0)
- return r;
-
r = sd_event_add_signal(s->events, &s->sigint_event, SIGINT, NULL, s);
if (r < 0)
return r;
r = sd_event_add_signal(s->events, &s->sigint_event, SIGINT, NULL, s);
if (r < 0)
return r;
- r = sd_event_source_set_description(s->sigint_event, "sigint");
- if (r < 0)
- return r;
-
return 0;
}
return 0;
}
@@
-849,7
+837,7
@@
static int remoteserver_init(RemoteServer *s,
r = sd_event_default(&s->events);
if (r < 0) {
r = sd_event_default(&s->events);
if (r < 0) {
- log_error
("Failed to allocate event loop: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to allocate event loop: %m"
);
return r;
}
return r;
}
@@
-863,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) {
@@
-890,7
+876,7
@@
static int remoteserver_init(RemoteServer *s,
r = getnameinfo_pretty(fd, &hostname);
if (r < 0) {
r = getnameinfo_pretty(fd, &hostname);
if (r < 0) {
- log_error
("Failed to retrieve remote name: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to retrieve remote name: %m"
);
return r;
}
return r;
}
@@
-904,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;
}
}
@@
-1059,7
+1045,7
@@
static int dispatch_raw_source_event(sd_event_source *event,
} else if (r == -EAGAIN) {
return 0;
} else if (r < 0) {
} else if (r == -EAGAIN) {
return 0;
} else if (r < 0) {
- log_info
("Closing connection: %s", strerror(-r)
);
+ log_info
_errno(r, "Closing connection: %m"
);
remove_source(server, fd);
return 0;
} else
remove_source(server, fd);
return 0;
} else
@@
-1092,7
+1078,7
@@
static int accept_connection(const char* type, int fd,
r = socket_address_print(addr, &a);
if (r < 0) {
r = socket_address_print(addr, &a);
if (r < 0) {
- log_error
("socket_address_print(): %s", strerror(-r)
);
+ log_error
_errno(r, "socket_address_print(): %m"
);
close(fd2);
return r;
}
close(fd2);
return r;
}
@@
-1469,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;
@@
-1550,7
+1530,7
@@
int main(int argc, char **argv) {
r = sd_event_set_watchdog(s.events, true);
if (r < 0)
r = sd_event_set_watchdog(s.events, true);
if (r < 0)
- log_error
("Failed to enable watchdog: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to enable watchdog: %m"
);
else
log_debug("Watchdog is %s.", r > 0 ? "enabled" : "disabled");
else
log_debug("Watchdog is %s.", r > 0 ? "enabled" : "disabled");
@@
-1569,7
+1549,7
@@
int main(int argc, char **argv) {
r = sd_event_run(s.events, -1);
if (r < 0) {
r = sd_event_run(s.events, -1);
if (r < 0) {
- log_error
("Failed to run event loop: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to run event loop: %m"
);
break;
}
}
break;
}
}