diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-02-12 01:13:47 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-02-12 01:13:47 +0000 |
| commit | e87f0c3347747708c65f0d9f54d3fb1895fb4162 (patch) | |
| tree | 65159531f88201e81bdbf7561edfcc2e3fa87fbf /sysdeps/unix/sysv/linux/i386/shmctl.c | |
| parent | a58a476357c95a7b321aee9746af741da95caf32 (diff) | |
| download | glibc-e87f0c3347747708c65f0d9f54d3fb1895fb4162.tar.gz | |
Update.
* sysdeps/unix/sysv/linux/i386/shmctl.c: Fix handling of save_errno.
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386/shmctl.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/shmctl.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/shmctl.c b/sysdeps/unix/sysv/linux/i386/shmctl.c index 2fffc16f1f..0b68d785fe 100644 --- a/sysdeps/unix/sysv/linux/i386/shmctl.c +++ b/sysdeps/unix/sysv/linux/i386/shmctl.c @@ -80,24 +80,23 @@ __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) case SHM_STAT: case IPC_STAT: case IPC_SET: -#if __WORDSIZE != 32 +# if __WORDSIZE != 32 case IPC_INFO: -#endif +# endif break; default: return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd, 0, buf); } { - int save_errno = result; struct __old_shmid_ds old; -#ifdef __NR_getuid32 +# ifdef __NR_getuid32 if (__libc_missing_32bit_uids <= 0) { if (__libc_missing_32bit_uids < 0) { - save_errno = errno; + int save_errno = errno; /* Test presence of new IPC by testing for getuid32 syscall. */ result = INLINE_SYSCALL (getuid32, 0); @@ -113,7 +112,7 @@ __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) return result; } } -#endif +# endif if (cmd == IPC_SET) { @@ -146,7 +145,7 @@ __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) buf->shm_cpid = old.shm_cpid; buf->shm_lpid = old.shm_lpid; } -#if __WORDSIZE != 32 +# if __WORDSIZE != 32 else if (result != -1 && cmd == IPC_INFO) { struct __old_shminfo *oldi = (struct __old_shminfo *)&old; @@ -159,7 +158,7 @@ __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) i->shmseg = oldi->shmseg; i->shmall = oldi->shmall; } -#endif +# endif return result; } #endif |