* elf/dl-misc.c (_dl_debug_vdprintf): Don't depend on 5-digit PIDs.
This commit is contained in:
Ulrich Drepper 2002-12-13 19:43:31 +00:00
parent 9ae0909b35
commit d94e16c4fe
2 changed files with 9 additions and 7 deletions

View file

@ -1,5 +1,7 @@
2002-12-13 Ulrich Drepper <drepper@redhat.com> 2002-12-13 Ulrich Drepper <drepper@redhat.com>
* elf/dl-misc.c (_dl_debug_vdprintf): Don't depend on 5-digit PIDs.
* misc/syslog.c (log_cleanup): Don't use parameter in * misc/syslog.c (log_cleanup): Don't use parameter in
__libc_lock_unlock call, use syslog_lock directly. Adjust callers to __libc_lock_unlock call, use syslog_lock directly. Adjust callers to
pass NULL instead of a pointer to syslog_lock. pass NULL instead of a pointer to syslog_lock.

View file

@ -92,7 +92,7 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg)
struct iovec iov[niovmax]; struct iovec iov[niovmax];
int niov = 0; int niov = 0;
pid_t pid = 0; pid_t pid = 0;
char pidbuf[7]; char pidbuf[12];
while (*fmt != '\0') while (*fmt != '\0')
{ {
@ -106,17 +106,17 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg)
{ {
char *p; char *p;
pid = __getpid (); pid = __getpid ();
assert (pid >= 0 && pid < 100000); assert (pid >= 0 && sizeof (pid_t) <= 4);
p = _itoa (pid, &pidbuf[5], 10, 0); p = _itoa (pid, &pidbuf[10], 10, 0);
while (p > pidbuf) while (p > pidbuf)
*--p = '0'; *--p = ' ';
pidbuf[5] = ':'; pidbuf[10] = ':';
pidbuf[6] = '\t'; pidbuf[11] = '\t';
} }
/* Append to the output. */ /* Append to the output. */
assert (niov < niovmax); assert (niov < niovmax);
iov[niov].iov_len = 7; iov[niov].iov_len = 12;
iov[niov++].iov_base = pidbuf; iov[niov++].iov_base = pidbuf;
/* No more tags until we see the next newline. */ /* No more tags until we see the next newline. */