* sysdeps/unix/sysv/linux/ia64/has_cpuclock.c: Include not-cancel.h.

	(has_cpuclock): Use open_not_cancel_2 instead of open, read_not_cancel
	instead of read and close_not_cancel_no_status instead of close.

diff --git a/ChangeLog b/ChangeLog
index 9e4d6f68b80f6f098537abdb624958bbd094b9e4..069b14084cc9d7780377c324a3cf756e5ce4a8aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-07-12  Jakub Jelinek  <jakub@redhat.com>
 
+       * sysdeps/unix/sysv/linux/ia64/has_cpuclock.c: Include not-cancel.h.
+       (has_cpuclock): Use open_not_cancel_2 instead of open, read_not_cancel
+       instead of read and close_not_cancel_no_status instead of close.
+
        * sysdeps/s390/s390-64/bcopy.S (__bcopy): Use
        HIDDEN_BUILTIN_JUMPTARGET to jump to memmove.
 

diff --git a/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c b/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c
index ee191612721495ff1023c670368b9a3ce758fc99..39511cd2c5bef426ec4df76ed7ed3de089f86bc0 100644 (file)
--- a/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c
+++ b/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001, 2003, 2004, 2005 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
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-
+#include <not-cancel.h>
 
 static int itc_usable;
 
@@ -31,18 +31,18 @@ has_cpuclock (void)
   if (__builtin_expect (itc_usable == 0, 0))
     {
       int newval = 1;
-      int fd = open ("/proc/sal/itc_drift", O_RDONLY);
+      int fd = open_not_cancel_2 ("/proc/sal/itc_drift", O_RDONLY);
       if (__builtin_expect (fd != -1, 1))
        {
          char buf[16];
          /* We expect the file to contain a single digit followed by
             a newline.  If the format changes we better not rely on
             the file content.  */
-         if (read (fd, buf, sizeof buf) != 2 || buf[0] != '0'
-             || buf[1] != '\n')
+         if (read_not_cancel (fd, buf, sizeof buf) != 2
+             || buf[0] != '0' || buf[1] != '\n')
            newval = -1;
 
-         close (fd);
+         close_not_cancel_no_status (fd);
        }
 
       itc_usable = newval;