about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-02-26 01:32:44 +0000
committerUlrich Drepper <drepper@redhat.com>2004-02-26 01:32:44 +0000
commit17568537740cb4bbeb28608a8ae6ba7a4fcf80c9 (patch)
treeadd616e1fb16331a69de439dd513ae6b13625f0a /sysdeps
parentd024596d616ed20e04dcfacc06bd77d8d1e2b64b (diff)
downloadglibc-17568537740cb4bbeb28608a8ae6ba7a4fcf80c9.tar.gz
glibc-17568537740cb4bbeb28608a8ae6ba7a4fcf80c9.tar.xz
glibc-17568537740cb4bbeb28608a8ae6ba7a4fcf80c9.zip
Update.
2004-02-24  Arnold D. Robbins  <arnold@skeeve.com>

	* posix/regex_internal.c (build_wcs_upper_buffer): Enclose
	`offsets_needed' label in `#ifdef _LIBC' to silence `unused label'
	compiler warning.

2004-02-24  Nelson H.F. Beebe  <beebe@math.utah.edu>

	* posix/regex_internal.c (build_wcs_buffer): Add cast to char* in call
	to `wcrtomb'.
	* posix/regex_internal.h (bitset_not, bitset_merge, bitset_not_merge,
	bitset_mask, re_string_char_size_a, re_string_wchar_at,
	re_string_elem_size_at): Change to use prototypes.
	(re_string_char_size_at, re_string_wchar_at,
	re_string_elem_size_at): Declare as `internal_function'.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/sysconf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/sysconf.c b/sysdeps/unix/sysv/linux/sysconf.c
index 842c8794d0..94cba88e90 100644
--- a/sysdeps/unix/sysv/linux/sysconf.c
+++ b/sysdeps/unix/sysv/linux/sysconf.c
@@ -51,7 +51,7 @@ __sysconf (int name)
       {
 	/* Try to read the information from the /proc/sys/kernel/ngroups_max
 	   file.  */
-	int fd = __open ("/proc/sys/kernel/ngroups_max", O_RDONLY);
+	int fd = __open_nocancel ("/proc/sys/kernel/ngroups_max", O_RDONLY);
 	if (fd != -1)
 	  {
 	    /* This is more than enough, the file contains a single
@@ -59,7 +59,7 @@ __sysconf (int name)
 	    char buf[32];
 	    long int res = -1l;
 
-	    ssize_t n = __read (fd, buf, sizeof (buf) - 1);
+	    ssize_t n = __read_nocancel (fd, buf, sizeof (buf) - 1);
 	    if (n > 0)
 	      {
 		/* Terminate the string.  */
@@ -71,7 +71,7 @@ __sysconf (int name)
 		  res = -1l;
 	      }
 
-	    __close (fd);
+	    __close_nocancel (fd);
 
 	    if (res != -1)
 	      return res;