chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: basic autoconfization
[elogind.git]
/
logger.c
diff --git
a/logger.c
b/logger.c
index 311458bd2660b4c3776b40f699eca3958f955530..af3293bd7e1812f6b46464e736bd5a8f5deb6b11 100644
(file)
--- a/
logger.c
+++ b/
logger.c
@@
-155,7
+155,7
@@
static int stream_log(Stream *s, char *p, usec_t timestamp) {
IOVEC_SET_STRING(iovec[1], s->process);
IOVEC_SET_STRING(iovec[2], header_pid);
IOVEC_SET_STRING(iovec[3], p);
IOVEC_SET_STRING(iovec[1], s->process);
IOVEC_SET_STRING(iovec[2], header_pid);
IOVEC_SET_STRING(iovec[3], p);
- IOVEC_SET_STRING(iovec[4], "\n");
+ IOVEC_SET_STRING(iovec[4],
(char*)
"\n");
if (writev(s->server->kmsg_fd, iovec, ELEMENTSOF(iovec)) < 0)
return -errno;
if (writev(s->server->kmsg_fd, iovec, ELEMENTSOF(iovec)) < 0)
return -errno;
@@
-548,9
+548,9
@@
int main(int argc, char *argv[]) {
for (;;) {
struct epoll_event event;
for (;;) {
struct epoll_event event;
- int
n
;
+ int
k
;
- if ((
n
= epoll_wait(server.epoll_fd,
+ if ((
k
= epoll_wait(server.epoll_fd,
&event, 1,
server.n_streams <= 0 ? TIMEOUT : -1)) < 0) {
&event, 1,
server.n_streams <= 0 ? TIMEOUT : -1)) < 0) {
@@
-561,7
+561,7
@@
int main(int argc, char *argv[]) {
goto fail;
}
goto fail;
}
- if (
n
<= 0)
+ if (
k
<= 0)
break;
if ((r = process_event(&server, &event)) < 0)
break;
if ((r = process_event(&server, &event)) < 0)