chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timer: fully implement timer units
[elogind.git]
/
src
/
logger.c
diff --git
a/src/logger.c
b/src/logger.c
index 2e036dd77bc14153d9c3e90a5d6cbcd2b28d569e..5c7e4ee42b9cd4554450a210ade8f5e55d8d584b 100644
(file)
--- a/
src/logger.c
+++ b/
src/logger.c
@@
-89,7
+89,7
@@
struct Stream {
LIST_FIELDS(Stream, stream);
};
LIST_FIELDS(Stream, stream);
};
-static int stream_log(Stream *s, char *p, usec_t t
imestamp
) {
+static int stream_log(Stream *s, char *p, usec_t t
s
) {
char header_priority[16], header_time[64], header_pid[16];
struct iovec iovec[5];
char header_priority[16], header_time[64], header_pid[16];
struct iovec iovec[5];
@@
-134,7
+134,7
@@
static int stream_log(Stream *s, char *p, usec_t timestamp) {
time_t t;
struct tm *tm;
time_t t;
struct tm *tm;
- t = (time_t) (t
imestamp
/ USEC_PER_SEC);
+ t = (time_t) (t
s
/ USEC_PER_SEC);
if (!(tm = localtime(&t)))
return -EINVAL;
if (!(tm = localtime(&t)))
return -EINVAL;
@@
-177,7
+177,7
@@
static int stream_log(Stream *s, char *p, usec_t timestamp) {
return 0;
}
return 0;
}
-static int stream_line(Stream *s, char *p, usec_t t
imestamp
) {
+static int stream_line(Stream *s, char *p, usec_t t
s
) {
int r;
assert(s);
int r;
assert(s);
@@
-236,13
+236,13
@@
static int stream_line(Stream *s, char *p, usec_t timestamp) {
return 0;
case STREAM_RUNNING:
return 0;
case STREAM_RUNNING:
- return stream_log(s, p, t
imestamp
);
+ return stream_log(s, p, t
s
);
}
assert_not_reached("Unknown stream state");
}
}
assert_not_reached("Unknown stream state");
}
-static int stream_scan(Stream *s, usec_t t
imestamp
) {
+static int stream_scan(Stream *s, usec_t t
s
) {
char *p;
size_t remaining;
int r = 0;
char *p;
size_t remaining;
int r = 0;
@@
-259,7
+259,7
@@
static int stream_scan(Stream *s, usec_t timestamp) {
*newline = 0;
*newline = 0;
- if ((r = stream_line(s, p, t
imestamp
)) >= 0) {
+ if ((r = stream_line(s, p, t
s
)) >= 0) {
remaining -= newline-p+1;
p = newline+1;
}
remaining -= newline-p+1;
p = newline+1;
}
@@
-273,7
+273,7
@@
static int stream_scan(Stream *s, usec_t timestamp) {
return r;
}
return r;
}
-static int stream_process(Stream *s, usec_t t
imestamp
) {
+static int stream_process(Stream *s, usec_t t
s
) {
ssize_t l;
int r;
assert(s);
ssize_t l;
int r;
assert(s);
@@
-292,7
+292,7
@@
static int stream_process(Stream *s, usec_t timestamp) {
return 0;
s->length += l;
return 0;
s->length += l;
- r = stream_scan(s, t
imestamp
);
+ r = stream_scan(s, t
s
);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-501,10
+501,10
@@
static int process_event(Server *s, struct epoll_event *ev) {
}
} else {
}
} else {
- usec_t t
imestamp
;
+ usec_t t
s
;
Stream *stream = ev->data.ptr;
Stream *stream = ev->data.ptr;
- t
imestamp
= now(CLOCK_REALTIME);
+ t
s
= now(CLOCK_REALTIME);
if (!(ev->events & EPOLLIN)) {
log_info("Got invalid event from epoll. (2)");
if (!(ev->events & EPOLLIN)) {
log_info("Got invalid event from epoll. (2)");
@@
-512,7
+512,7
@@
static int process_event(Server *s, struct epoll_event *ev) {
return 0;
}
return 0;
}
- if ((r = stream_process(stream, t
imestamp
)) <= 0) {
+ if ((r = stream_process(stream, t
s
)) <= 0) {
if (r < 0)
log_info("Got error on stream: %s", strerror(-r));
if (r < 0)
log_info("Got error on stream: %s", strerror(-r));