about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/generic/check_fds.c2
-rw-r--r--sysdeps/unix/sysv/linux/not-cancel.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index cdca90212a..5c6557ff9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2003-04-20  Ulrich Drepper  <drepper@redhat.com>
 
-	* sysdeps/generic/check_fds.c (check_one_fd): Cast first parameter
-	of open_not_cancel explicitly to const char*.
+	* sysdeps/unix/sysv/linux/not-cancel.h (open_not_cancel): Cast
+	first syscall parameter to cnst char*.
 
 2003-04-19  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/sysdeps/generic/check_fds.c b/sysdeps/generic/check_fds.c
index 62df3e5cc0..8a3efd1b37 100644
--- a/sysdeps/generic/check_fds.c
+++ b/sysdeps/generic/check_fds.c
@@ -49,7 +49,7 @@ check_one_fd (int fd, int mode)
       /* Something is wrong with this descriptor, it's probably not
 	 opened.  Open /dev/null so that the SUID program we are
 	 about to start does not accidently use this descriptor.  */
-      int nullfd = open_not_cancel ((const char *) _PATH_DEVNULL, mode);
+      int nullfd = open_not_cancel (_PATH_DEVNULL, mode);
       /* We are very paranoid here.  With all means we try to ensure
 	 that we are actually opening the /dev/null device and nothing
 	 else.
diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h
index e2cb3b24a1..cf61cff379 100644
--- a/sysdeps/unix/sysv/linux/not-cancel.h
+++ b/sysdeps/unix/sysv/linux/not-cancel.h
@@ -24,7 +24,7 @@
 #ifdef INLINE_SYSCALL
 # define open_not_cancel(name, flags, mode...) \
   ({ int _mode = (0, ##mode);						      \
-     INLINE_SYSCALL (open, 3, name, flags, _mode); })
+     INLINE_SYSCALL (open, 3, (const char *) name, flags, _mode); })
 #endif
 
 /* Uncancelable close.  */