chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-rtnl: extend type system to allow address-family to decide the union members
[elogind.git]
/
src
/
journal
/
journald-native.c
diff --git
a/src/journal/journald-native.c
b/src/journal/journald-native.c
index e994752558e4f9a70886da6721b101ef8a797179..851625de04acc0ec44763bbe1b6e853905a89e5e 100644
(file)
--- a/
src/journal/journald-native.c
+++ b/
src/journal/journald-native.c
@@
-135,7
+135,7
@@
void server_process_native_message(
/* A property follows */
/* n existing properties, 1 new, +1 for _TRANSPORT */
/* A property follows */
/* n existing properties, 1 new, +1 for _TRANSPORT */
- if (!GREEDY_REALLOC(iovec, m, n + 2 + N_IOVEC_META_FIELDS +
!!object_pid *
N_IOVEC_OBJECT_FIELDS)) {
+ if (!GREEDY_REALLOC(iovec, m, n + 2 + N_IOVEC_META_FIELDS + N_IOVEC_OBJECT_FIELDS)) {
log_oom();
break;
}
log_oom();
break;
}
@@
-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");