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

journald: prefix exported calls with "server_", unexport unnecessary calls

Browse source
This commit is contained in:
Lennart Poettering 2015-01-04 22:09:07 +01:00
parent fa6ac76083
commit 8531ae707d
5 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/journal/journald-audit.c
View file

@ -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");

2
src/journal/journald-native.c
View file

@ -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");

4
src/journal/journald-server.c
View file

@ -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);

3
src/journal/journald-server.h
View file

@ -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);

2
src/journal/journald-syslog.c
View file

@ -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");