Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
2004-11-20  Ulrich Drepper  <drepper@redhat.com>

	* misc/syslog.c: Remove !USE_IN_LIBIO code.
  • Loading branch information
Ulrich Drepper committed Nov 20, 2004
1 parent fc9b33c commit d3a9cb0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
14 changes: 4 additions & 10 deletions misc/syslog.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit d3a9cb0

Please sign in to comment.