diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-08-02 00:08:03 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-08-02 00:08:03 +0000 |
| commit | fbbc73b3d7fc1c1f4aa8c7f8d30ced6778c50506 (patch) | |
| tree | 6e07dcee0e801aae4937016b279d4f997cc60dbd /nptl | |
| parent | a4518922f3f43dded5669f40b12227ab76df80fe (diff) | |
| download | glibc-fbbc73b3d7fc1c1f4aa8c7f8d30ced6778c50506.tar glibc-fbbc73b3d7fc1c1f4aa8c7f8d30ced6778c50506.tar.gz glibc-fbbc73b3d7fc1c1f4aa8c7f8d30ced6778c50506.tar.bz2 glibc-fbbc73b3d7fc1c1f4aa8c7f8d30ced6778c50506.zip | |
* nscd/initgrcache.c (addinitgroupsX): Judge successful lookups by
status of NSS calls, not the number of returned entries.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/smp.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/smp.h b/nptl/sysdeps/unix/sysv/linux/i386/smp.h index cb24c9e177..f68a0c0758 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/smp.h +++ b/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -31,25 +31,25 @@ is_smp_system (void) { union { - struct utsname uts; + struct utsname uts; char buf[512]; - }; + } u; char *cp; /* Try reading the number using `sysctl' first. */ - if (uname (&uts) == 0) - cp = uts.version; + if (uname (&u.uts) == 0) + cp = u.uts.version; else { /* This was not successful. Now try reading the /proc filesystem. */ int fd = open_not_cancel_2 ("/proc/sys/kernel/version", O_RDONLY); if (__builtin_expect (fd, 0) == -1 - || (reslen = read_not_cancel (fd, buf, sizeof (buf))) <= 0) + || read_not_cancel (fd, u.buf, sizeof (u.buf)) <= 0) /* This also didn't work. We give up and say it's a UP machine. */ - buf[0] = '\0'; + u.buf[0] = '\0'; close_not_cancel_no_status (fd); - cp = buf; + cp = u.buf; } return strstr (cp, "SMP") != NULL; |