diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-11-21 11:37:07 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-11-21 11:37:07 +0000 |
| commit | f2fad0ae26d274bd203ba350a66b6f2bec3f6740 (patch) | |
| tree | 7e0ffe5e737e956aa3b100af71360d62949535af /misc | |
| parent | 8a2f63b734c8081b54dcf75b6d5438833d503f64 (diff) | |
Updated to fedora-glibc-20041121T1116
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/syslog.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/misc/syslog.c b/misc/syslog.c index 38d5a8e5f5..6916356da7 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; |