Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / csu / check_fds.c

diff --git a/csu/check_fds.c b/csu/check_fds.c
index abcdfc071d76df88cbef07f525d648ebd4ee24e2..fceba96b1f696b8fdea0e3034ab711d87642afd6 100644 (file)
--- a/csu/check_fds.c
+++ b/csu/check_fds.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2018 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2019 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
@@ -39,8 +39,7 @@
 static void
 check_one_fd (int fd, int mode)
 {
-  /* Note that fcntl() with this parameter is not a cancellation point.  */
-  if (__builtin_expect (__libc_fcntl (fd, F_GETFD), 0) == -1
+  if (__builtin_expect (__fcntl64_nocancel (fd, F_GETFD), 0) == -1
       && errno == EBADF)
     {
       const char *name;
@@ -50,12 +49,12 @@ check_one_fd (int fd, int mode)
       if ((mode & O_ACCMODE) == O_WRONLY)
        {
          name = _PATH_DEV "full";
-         dev = makedev (DEV_FULL_MAJOR, DEV_FULL_MINOR);
+         dev = __gnu_dev_makedev (DEV_FULL_MAJOR, DEV_FULL_MINOR);
        }
       else
        {
          name = _PATH_DEVNULL;
-         dev = makedev (DEV_NULL_MAJOR, DEV_NULL_MINOR);
+         dev = __gnu_dev_makedev (DEV_NULL_MAJOR, DEV_NULL_MINOR);
        }
 
       /* Something is wrong with this descriptor, it's probably not