picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10728 from keszybz/four-unrelated-cleanups 

Four unrelated cleanups
This commit is contained in:
Lennart Poettering 2018-11-11 21:16:14 +01:00 committed by GitHub
parent 707ade9d13 8e143a1232
commit 5fb0720ebb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
man/sd-bus.xml
View File

@ -47,6 +47,7 @@
<citerefentry><refentrytitle>sd_bus_attach_event</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_bus_creds_get_pid</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_bus_creds_new_from_pid</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_bus_close</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_bus_default</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd-bus-errors</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_bus_error</refentrytitle><manvolnum>3</manvolnum></citerefentry>,

7
src/journal/journalctl.c
View File

@ -2058,8 +2058,13 @@ static int wait_for_change(sd_journal *j, int poll_fd) {
if (r < 0)
return log_error_errno(r, "Failed to determine journal waiting time: %m");
if (ppoll(pollfds, ELEMENTSOF(pollfds), timeout == USEC_INFINITY ? NULL : timespec_store(&ts, timeout), NULL) < 0)
if (ppoll(pollfds, ELEMENTSOF(pollfds),
timeout == USEC_INFINITY ? NULL : timespec_store(&ts, timeout), NULL) < 0) {
if (errno == EINTR)
return 0;
return log_error_errno(errno, "Couldn't wait for journal event: %m");
}
if (pollfds[1].revents & (POLLHUP|POLLERR)) { /* STDOUT has been closed? */
log_debug("Standard output has been closed.");

3
src/libsystemd/sd-bus/bus-error.c
View File

@ -205,8 +205,7 @@ _public_ void sd_bus_error_free(sd_bus_error *e) {
free((void*) e->message);
}
e->name = e->message = NULL;
e->_need_free = 0;
*e = (sd_bus_error) {};
}
_public_ int sd_bus_error_set(sd_bus_error *e, const char *name, const char *message) {

2
src/shared/seccomp-util.c
View File

@ -933,7 +933,7 @@ int seccomp_load_syscall_filter_set(uint32_t default_action, const SyscallFilter
assert(set);
/* The one-stop solution: allocate a seccomp object, add the specified filter to it, and apply it. Once for
* earch local arch. */
* each local arch. */
SECCOMP_FOREACH_LOCAL_ARCH(arch) {
_cleanup_(seccomp_releasep) scmp_filter_ctx seccomp = NULL;