X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald-native.c;h=851625de04acc0ec44763bbe1b6e853905a89e5e;hb=c85770ad84af4bcaace5055147d53da6fe28ef9a;hp=e994752558e4f9a70886da6721b101ef8a797179;hpb=12a717f8347f3daf0ae46a2b71c7d011d9c12fea;p=elogind.git diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index e99475255..851625de0 100644 --- 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 */ - 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; } @@ -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");