diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | misc/syslog.c | 14 |
2 files changed, 8 insertions, 10 deletions
@@ -1,3 +1,7 @@ +2004-11-20 Ulrich Drepper <drepper@redhat.com> + + * misc/syslog.c: Remove !USE_IN_LIBIO code. + 2004-11-20 Jakub Jelinek <jakub@redhat.com> * signal/signal.h (__sysv_signal, sysv_signal, signal, bsd_signal, diff --git a/misc/syslog.c b/misc/syslog.c index 38d5a8e..6916356 100644 --- a/misc/syslog.c +++ b/misc/syslog.c @@ -56,10 +56,8 @@ static char sccsid[] = "@(#)syslog.c 8.4 (Berkeley) 3/18/94"; #include <varargs.h> #endif -#ifdef USE_IN_LIBIO -# include <libio/iolibio.h> -# define ftell(s) INTUSE(_IO_ftell) (s) -#endif +#include <libio/iolibio.h> +#define ftell(s) INTUSE(_IO_ftell) (s) static int LogType = SOCK_DGRAM; /* type of socket connection */ static int LogFile = -1; /* fd for log */ @@ -187,16 +185,12 @@ vsyslog(pri, fmt, ap) __fsetlocking (f, FSETLOCKING_BYCALLER); prioff = fprintf (f, "<%d>", pri); (void) time (&now); -#ifdef USE_IN_LIBIO f->_IO_write_ptr += __strftime_l (f->_IO_write_ptr, - f->_IO_write_end - f->_IO_write_ptr, + f->_IO_write_end + - f->_IO_write_ptr, "%h %e %T ", __localtime_r (&now, &now_tm), &_nl_C_locobj); -#else - f->__bufp += strftime (f->__bufp, f->__put_limit - f->__bufp, - "%h %e %T ", __localtime_r (&now, &now_tm)); -#endif msgoff = ftell (f); if (LogTag == NULL) LogTag = __progname; |