about summary refs log tree commit diff
path: root/sysdeps/mach/hurd/utimes.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-10-10 09:28:40 +0000
committerRoland McGrath <roland@gnu.org>2006-10-10 09:28:40 +0000
commite298a3189dfbdab4a0bdf40de158b6da98717fca (patch)
treec07bd41c8dd6dd8b4624c26c750f683189d1b0c6 /sysdeps/mach/hurd/utimes.c
parent1100f84983f22e570a5081cbe79b0ef8fe4952d7 (diff)
downloadglibc-e298a3189dfbdab4a0bdf40de158b6da98717fca.tar.gz
glibc-e298a3189dfbdab4a0bdf40de158b6da98717fca.tar.xz
glibc-e298a3189dfbdab4a0bdf40de158b6da98717fca.zip
2006-10-10 Roland McGrath <roland@frob.com>
	* sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast.
	* sysdeps/mach/hurd/futimes.c: Likewise.
	* sysdeps/mach/hurd/lutimes.c: Likewise.
Diffstat (limited to 'sysdeps/mach/hurd/utimes.c')
-rw-r--r--sysdeps/mach/hurd/utimes.c19
1 files changed, 12 insertions, 7 deletions
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)