diff options
| -rw-r--r-- | src/journal/journald-audit.c | 2 | ||||
| -rw-r--r-- | src/journal/journald-native.c | 2 | ||||
| -rw-r--r-- | src/journal/journald-server.c | 4 | ||||
| -rw-r--r-- | src/journal/journald-server.h | 3 | ||||
| -rw-r--r-- | src/journal/journald-syslog.c | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c index 20936f4bed..9d21738439 100644 --- a/src/journal/journald-audit.c +++ b/src/journal/journald-audit.c @@ -538,7 +538,7 @@ int server_open_audit(Server *s) { if (r < 0) return log_error_errno(errno, "Failed to set SO_PASSCRED on audit socket: %m"); - r = sd_event_add_io(s->event, &s->audit_event_source, s->audit_fd, EPOLLIN, process_datagram, s); + r = sd_event_add_io(s->event, &s->audit_event_source, s->audit_fd, EPOLLIN, server_process_datagram, s); if (r < 0) return log_error_errno(r, "Failed to add audit fd to event loop: %m"); diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index b0120ef5f8..851625de04 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -453,7 +453,7 @@ int server_open_native_socket(Server*s) { if (r < 0) return log_error_errno(errno, "SO_TIMESTAMP failed: %m"); - r = sd_event_add_io(s->event, &s->native_event_source, s->native_fd, EPOLLIN, process_datagram, s); + r = sd_event_add_io(s->event, &s->native_event_source, s->native_fd, EPOLLIN, server_process_datagram, s); if (r < 0) return log_error_errno(r, "Failed to add native server fd to event loop: %m"); diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 6d037cfec4..d987d8f759 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -446,7 +446,7 @@ static void server_cache_hostname(Server *s) { s->hostname_field = x; } -bool shall_try_append_again(JournalFile *f, int r) { +static bool shall_try_append_again(JournalFile *f, int r) { /* -E2BIG Hit configured limit -EFBIG Hit fs limit @@ -1106,7 +1106,7 @@ finish: return r; } -int process_datagram(sd_event_source *es, int fd, uint32_t revents, void *userdata) { +int server_process_datagram(sd_event_source *es, int fd, uint32_t revents, void *userdata) { Server *s = userdata; assert(s); diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h index 9c7fa50a96..c96877c508 100644 --- a/src/journal/journald-server.h +++ b/src/journal/journald-server.h @@ -167,7 +167,6 @@ const char *split_mode_to_string(SplitMode s) _const_; SplitMode split_mode_from_string(const char *s) _pure_; void server_fix_perms(Server *s, JournalFile *f, uid_t uid); -bool shall_try_append_again(JournalFile *f, int r); int server_init(Server *s); void server_done(Server *s); void server_sync(Server *s); @@ -176,4 +175,4 @@ void server_rotate(Server *s); int server_schedule_sync(Server *s, int priority); int server_flush_to_var(Server *s); void server_maybe_append_tags(Server *s); -int process_datagram(sd_event_source *es, int fd, uint32_t revents, void *userdata); +int server_process_datagram(sd_event_source *es, int fd, uint32_t revents, void *userdata); diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index cc44d45949..6f43fd48c9 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -457,7 +457,7 @@ int server_open_syslog_socket(Server *s) { if (r < 0) return log_error_errno(errno, "SO_TIMESTAMP failed: %m"); - r = sd_event_add_io(s->event, &s->syslog_event_source, s->syslog_fd, EPOLLIN, process_datagram, s); + r = sd_event_add_io(s->event, &s->syslog_event_source, s->syslog_fd, EPOLLIN, server_process_datagram, s); if (r < 0) return log_error_errno(r, "Failed to add syslog server fd to event loop: %m"); |