chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fa6ac76
)
journald: prefix exported calls with "server_", unexport unnecessary calls
author
Lennart Poettering
<lennart@poettering.net>
Sun, 4 Jan 2015 21:09:07 +0000
(22:09 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 5 Jan 2015 00:40:51 +0000
(
01:40
+0100)
src/journal/journald-audit.c
patch
|
blob
|
history
src/journal/journald-native.c
patch
|
blob
|
history
src/journal/journald-server.c
patch
|
blob
|
history
src/journal/journald-server.h
patch
|
blob
|
history
src/journal/journald-syslog.c
patch
|
blob
|
history
diff --git
a/src/journal/journald-audit.c
b/src/journal/journald-audit.c
index 20936f4bed7109f58d90acf53f551674e0042442..9d217384398e042725c7374a1c69c2e2cb51c67f 100644
(file)
--- 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");
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");
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 b0120ef5f84a635ff50582b84d03f7478e14a8bb..851625de04acc0ec44763bbe1b6e853905a89e5e 100644
(file)
--- 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");
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");
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 6d037cfec4adc770ae6500cd3d15f8557aa9afad..d987d8f759977d7a9c7d9491c24cac97418edf8d 100644
(file)
--- 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;
}
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
/* -E2BIG Hit configured limit
-EFBIG Hit fs limit
@@
-1106,7
+1106,7
@@
finish:
return r;
}
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);
Server *s = userdata;
assert(s);
diff --git
a/src/journal/journald-server.h
b/src/journal/journald-server.h
index 9c7fa50a96e8976f484f03d7c75c8be1660f1b89..c96877c50812bbcca1e49f76520269b310957d14 100644
(file)
--- 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);
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);
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 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 cc44d459497f7518be9c8b5b9651f0b586c1b61e..6f43fd48c92c6e349d96d6917c3daf0949ab852a 100644
(file)
--- 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");
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");
if (r < 0)
return log_error_errno(r, "Failed to add syslog server fd to event loop: %m");