summaryrefslogtreecommitdiff
path: root/login
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-08-27 04:03:12 +0000
committerUlrich Drepper <drepper@redhat.com>2003-08-27 04:03:12 +0000
commita49daee2ef840ea42546cf367891e4c5e8047b3e (patch)
treeaca3d5d9f296a48d0629c6b4b5529403254775ae /login
parent13b3edfc7340eb2dc59669c1aaccab32f9207d39 (diff)
downloadglibc-a49daee2ef840ea42546cf367891e4c5e8047b3e.tar.gz
Update.
* login/programs/utmpdump.c (print_entry): Cast tv_usec to long to match format string. * sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c (union semun): Add __old_buf. (__new_semctl): Shut up warning. * sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h (_dl_string_hwcap): Add __attribute__ ((always_inline)). 2003-08-26 Jakub Jelinek <jakub@redhat.com>
Diffstat (limited to 'login')
-rw-r--r--login/programs/utmpdump.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/login/programs/utmpdump.c b/login/programs/utmpdump.c
index 225b67a265..8f6558ee25 100644
--- a/login/programs/utmpdump.c
+++ b/login/programs/utmpdump.c
@@ -1,5 +1,5 @@
/* utmpdump - dump utmp-like files.
- Copyright (C) 1997, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997.
@@ -28,16 +28,16 @@ static void
print_entry (struct utmp *up)
{
/* Mixed 32-/64-bit systems may have timeval structs of different sixe
- but need struct utmp to be the same size. So in 64-bit up->ut_tv may
+ but need struct utmp to be the same size. So in 64-bit up->ut_tv may
not be a timeval but a struct of __int32_t's. This would cause a compile
time warning and a formating error when 32-bit int is passed where
a 64-bit long is expected. So copy up->up_tv to a temporary timeval.
- This is 32-/64-bit agnostic and expands the timeval fields to the
+ This is 32-/64-bit agnostic and expands the timeval fields to the
expected size as needed. */
struct timeval temp_tv;
temp_tv.tv_sec = up->ut_tv.tv_sec;
temp_tv.tv_usec = up->ut_tv.tv_usec;
-
+
(printf) (
/* The format string. */
#if _HAVE_UT_TYPE
@@ -74,7 +74,7 @@ print_entry (struct utmp *up)
#endif
#if _HAVE_UT_TV
, 4 + ctime (&temp_tv.tv_sec)
- , temp_tv.tv_usec
+ , (long int) temp_tv.tv_usec
#else
, 4 + ctime (&up->ut_time)
#endif