correct plogv().
This commit is contained in:
parent
9edc8549c6
commit
c0fa39f338
12
crypto/dist/kame/racoon/plog.c
vendored
12
crypto/dist/kame/racoon/plog.c
vendored
@ -1,4 +1,4 @@
|
||||
/* $KAME: plog.c,v 1.22 2002/04/26 00:00:10 itojun Exp $ */
|
||||
/* $KAME: plog.c,v 1.23 2002/05/07 08:56:19 sakane Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
||||
@ -131,23 +131,18 @@ plog(int pri, const char *func, struct sockaddr *sa, const char *fmt, ...)
|
||||
|
||||
void
|
||||
plogv(int pri, const char *func, struct sockaddr *sa,
|
||||
const char *fmt, ...)
|
||||
const char *fmt, va_list ap)
|
||||
{
|
||||
char *newfmt;
|
||||
va_list ap;
|
||||
|
||||
if (pri > loglevel)
|
||||
return;
|
||||
|
||||
newfmt = plog_common(pri, fmt, func);
|
||||
|
||||
if (f_foreground) {
|
||||
va_start(ap, fmt);
|
||||
if (f_foreground)
|
||||
vprintf(newfmt, ap);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
va_start(ap, fmt);
|
||||
if (logfile)
|
||||
log_vaprint(logp, newfmt, ap);
|
||||
else {
|
||||
@ -156,7 +151,6 @@ plogv(int pri, const char *func, struct sockaddr *sa,
|
||||
else
|
||||
vsyslog(LOG_ALERT, newfmt, ap);
|
||||
}
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
void
|
||||
|
4
crypto/dist/kame/racoon/plog.h
vendored
4
crypto/dist/kame/racoon/plog.h
vendored
@ -1,4 +1,4 @@
|
||||
/* $KAME: plog.h,v 1.9 2002/04/26 00:00:10 itojun Exp $ */
|
||||
/* $KAME: plog.h,v 1.10 2002/05/07 08:56:19 sakane Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
||||
@ -62,7 +62,7 @@ extern int f_foreground;
|
||||
struct sockaddr;
|
||||
extern void plog __P((int, const char *, struct sockaddr *, const char *, ...));
|
||||
extern void plogv __P((int, const char *, struct sockaddr *,
|
||||
const char *, ...));
|
||||
const char *, va_list));
|
||||
extern void plogdump __P((int, void *, size_t));
|
||||
extern void ploginit __P((void));
|
||||
extern void plogset __P((char *));
|
||||
|
Loading…
Reference in New Issue
Block a user