diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/mach/hurd/futimes.c | 18 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/lutimes.c | 17 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/utimes.c | 19 |
3 files changed, 34 insertions, 20 deletions
diff --git a/sysdeps/mach/hurd/futimes.c b/sysdeps/mach/hurd/futimes.c index ca687b8bdf..4628eee2c3 100644 --- a/sysdeps/mach/hurd/futimes.c +++ b/sysdeps/mach/hurd/futimes.c @@ -1,5 +1,5 @@ /* futimes -- change access and modification times of open file. Hurd version. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -28,20 +28,24 @@ int __futimes (int fd, const struct timeval tvp[2]) { - struct timeval timevals[2]; + union tv + { + struct timeval tv; + time_value_t tvt; + }; + const union tv *u = (const union tv *) tvp; + union tv nulltv[2]; error_t err; if (tvp == NULL) { /* Setting the number of microseconds to `-1' tells the underlying filesystems to use the current time. */ - timevals[1].tv_usec = timevals[0].tv_usec = (time_t)-1; - tvp = timevals; + nulltv[0].tvt.microseconds = nulltv[1].tvt.microseconds = -1; + u = nulltv; } - err = HURD_DPORT_USE (fd, __file_utimes (port, - *(time_value_t *) &tvp[0], - *(time_value_t *) &tvp[1])); + err = HURD_DPORT_USE (fd, __file_utimes (port, u[0].tvt, u[1].tvt)); return err ? __hurd_dfail (fd, err) : 0; } weak_alias (__futimes, futimes) diff --git a/sysdeps/mach/hurd/lutimes.c b/sysdeps/mach/hurd/lutimes.c index cf89d8862f..bf5610c467 100644 --- a/sysdeps/mach/hurd/lutimes.c +++ b/sysdeps/mach/hurd/lutimes.c @@ -1,5 +1,5 @@ /* lutimes -- change access and modification times of a symlink. Hurd version. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -28,7 +28,13 @@ int __lutimes (const char *file, const struct timeval tvp[2]) { - struct timeval timevals[2]; + union tv + { + struct timeval tv; + time_value_t tvt; + }; + const union tv *u = (const union tv *) tvp; + union tv nulltv[2]; error_t err; file_t port; @@ -36,15 +42,14 @@ __lutimes (const char *file, const struct timeval tvp[2]) { /* Setting the number of microseconds to `-1' tells the underlying filesystems to use the current time. */ - timevals[1].tv_usec = timevals[0].tv_usec = (time_t)-1; - tvp = timevals; + nulltv[0].tvt.microseconds = nulltv[1].tvt.microseconds = -1; + u = nulltv; } port = __file_name_lookup (file, O_NOLINK, 0); if (port == MACH_PORT_NULL) return -1; - err = __file_utimes (port, - *(time_value_t *) &tvp[0], *(time_value_t *) &tvp[1]); + err = __file_utimes (port, u[0].tvt, u[1].tvt); __mach_port_deallocate (__mach_task_self (), port); if (err) return __hurd_fail (err); diff --git a/sysdeps/mach/hurd/utimes.c b/sysdeps/mach/hurd/utimes.c index 74f3a342f4..fdc1427feb 100644 --- a/sysdeps/mach/hurd/utimes.c +++ b/sysdeps/mach/hurd/utimes.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991-1995, 97, 99, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1991-1995,1997,1999,2000,2006 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -28,7 +29,13 @@ __utimes (file, tvp) const char *file; const struct timeval tvp[2]; { - struct timeval timevals[2]; + union tv + { + struct timeval tv; + time_value_t tvt; + }; + const union tv *u = (const union tv *) tvp; + union tv nulltv[2]; error_t err; file_t port; @@ -36,19 +43,17 @@ __utimes (file, tvp) { /* Setting the number of microseconds to `-1' tells the underlying filesystems to use the current time. */ - timevals[1].tv_usec = timevals[0].tv_usec = (time_t)-1; - tvp = timevals; + nulltv[0].tvt.microseconds = nulltv[1].tvt.microseconds = -1; + u = nulltv; } port = __file_name_lookup (file, 0, 0); if (port == MACH_PORT_NULL) return -1; - err = __file_utimes (port, - *(time_value_t *) &tvp[0], *(time_value_t *) &tvp[1]); + err = __file_utimes (port, u[0].tvt, u[1].tvt); __mach_port_deallocate (__mach_task_self (), port); if (err) return __hurd_fail (err); return 0; } - weak_alias (__utimes, utimes) |