chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make-secnet-sites: If definition found in wrong place, bomb out
[secnet.git]
/
log.c
diff --git
a/log.c
b/log.c
index 55f1ee125cbfba848002f1c536e8ad89e3bb3247..3a50a27ce47ab301ae317353f800fed9a2986b8b 100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-19,10
+19,10
@@
static void vMessage(uint32_t class, const char *message, va_list args)
FILE *dest=stdout;
#define MESSAGE_BUFLEN 1023
static char buff[MESSAGE_BUFLEN+1]={0,};
FILE *dest=stdout;
#define MESSAGE_BUFLEN 1023
static char buff[MESSAGE_BUFLEN+1]={0,};
-
uint32
_t bp;
+
size
_t bp;
char *nlp;
char *nlp;
- if (s
ecnet_is_daemon
) {
+ if (s
ystem_log
) {
/* Messages go to the system log interface */
bp=strlen(buff);
assert(bp < MESSAGE_BUFLEN);
/* Messages go to the system log interface */
bp=strlen(buff);
assert(bp < MESSAGE_BUFLEN);
@@
-488,8
+488,7
@@
struct fdlog {
};
static int log_from_fd_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
};
static int log_from_fd_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
- int *timeout_io,
- const struct timeval *tv_now, uint64_t *now)
+ int *timeout_io)
{
struct fdlog *st=sst;
if (!st->finished) {
{
struct fdlog *st=sst;
if (!st->finished) {
@@
-500,8
+499,7
@@
static int log_from_fd_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
return 0;
}
return 0;
}
-static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds,
- const struct timeval *tv_now, uint64_t *now)
+static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds)
{
struct fdlog *st=sst;
int r,remain,i;
{
struct fdlog *st=sst;
int r,remain,i;