diff --git a/src/core/dbus-manager.h b/src/core/dbus-manager.h index 201a876078..947b2a3ce7 100644 --- a/src/core/dbus-manager.h +++ b/src/core/dbus-manager.h @@ -16,11 +16,10 @@ void bus_manager_send_finished( usec_t initrd_usec, usec_t userspace_usec, usec_t total_usec); + void bus_manager_send_reloading(Manager *m, bool active); void bus_manager_send_change_signal(Manager *m); -int verify_run_space_and_log(const char *message); - int bus_property_get_oom_policy( sd_bus *bus, const char *path, @@ -29,6 +28,7 @@ int bus_property_get_oom_policy( sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error); + int bus_property_get_emergency_action( sd_bus *bus, const char *path, diff --git a/src/core/manager.c b/src/core/manager.c index 7938c989af..594e7bc2c7 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -113,7 +113,7 @@ /* How many units and jobs to process of the bus queue before returning to the event loop. */ #define MANAGER_BUS_MESSAGE_BUDGET 100U -#define DEFAULT_TASKS_MAX ((CGroupTasksMax) { 15U, 100U }) /* 15% */ +#define DEFAULT_TASKS_MAX ((const CGroupTasksMax) { 15U, 100U }) /* 15% */ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata); static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata); diff --git a/src/journal/journalctl-show.c b/src/journal/journalctl-show.c index 0fa919cfd2..08311f018d 100644 --- a/src/journal/journalctl-show.c +++ b/src/journal/journalctl-show.c @@ -341,7 +341,7 @@ static int on_first_event(sd_event_source *s, void *userdata) { if (r < 0) return r; - if (arg_follow && !arg_reverse && !c->has_cursor && !arg_since_set) { + if (arg_follow && !c->has_cursor && !arg_since_set) { r = sd_journal_get_cursor(c->journal, /* ret_cursor= */ NULL); if (r == -EADDRNOTAVAIL) { /* If we shall operate in --follow mode, and we are unable to get a cursor after diff --git a/src/shared/socket-label.h b/src/shared/socket-label.h index cfcb20f187..c6fb8c3d2a 100644 --- a/src/shared/socket-label.h +++ b/src/shared/socket-label.h @@ -13,7 +13,7 @@ typedef enum SocketAddressBindIPv6Only { const char* socket_address_bind_ipv6_only_to_string(SocketAddressBindIPv6Only b) _const_; SocketAddressBindIPv6Only socket_address_bind_ipv6_only_from_string(const char *s) _pure_; -SocketAddressBindIPv6Only socket_address_bind_ipv6_only_or_bool_from_string(const char *s); +SocketAddressBindIPv6Only socket_address_bind_ipv6_only_or_bool_from_string(const char *s) _pure_; int socket_address_listen( const SocketAddress *a,