diff options
Diffstat (limited to 'sysdeps/mach')
| -rw-r--r-- | sysdeps/mach/hurd/bits/stat.h | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/dl-sysdep.c | 8 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c | 7 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/ioctl.c | 6 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/mmap.c | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/ptrace.c | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/spawni.c | 4 |
7 files changed, 19 insertions, 18 deletions
diff --git a/sysdeps/mach/hurd/bits/stat.h b/sysdeps/mach/hurd/bits/stat.h index 5ef487e077..0044493ff3 100644 --- a/sysdeps/mach/hurd/bits/stat.h +++ b/sysdeps/mach/hurd/bits/stat.h @@ -218,8 +218,8 @@ struct stat64 #define S_IMMAP0 000100000000 /* ALL the unused bits. */ -#define S_ISPARE (~(S_IFMT|S_ITRANS|S_INOCACHE|S_IMMAP0| \ - S_IUSEUNK|S_IUNKNOWN|07777)) +#define S_ISPARE (~(S_IFMT|S_ITRANS|S_INOCACHE|S_IMMAP0 \ + |S_IUSEUNK|S_IUNKNOWN|07777)) #endif #ifdef __USE_MISC diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index a58338c930..07d64d8122 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -132,8 +132,8 @@ _dl_sysdep_start (void **start_argptr, __tunables_init (_environ); - if (_dl_hurd_data->flags & EXEC_STACK_ARGS && - _dl_hurd_data->user_entry == 0) + if (_dl_hurd_data->flags & EXEC_STACK_ARGS + && _dl_hurd_data->user_entry == 0) _dl_hurd_data->user_entry = (vm_address_t) ENTRY_POINT; unfmh(); /* XXX */ @@ -319,8 +319,8 @@ open_file (const char *file_name, int flags, assert (!(flags & ~(O_READ | O_CLOEXEC))); - startdir = _dl_hurd_data->portarray[file_name[0] == '/' ? - INIT_PORT_CRDIR : INIT_PORT_CWDIR]; + startdir = _dl_hurd_data->portarray[file_name[0] == '/' + ? INIT_PORT_CRDIR : INIT_PORT_CWDIR]; while (file_name[0] == '/') file_name++; diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c b/sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c index d407f7ba49..67ec39ec84 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c @@ -27,7 +27,8 @@ int pthread_mutexattr_setprotocol (pthread_mutexattr_t *attrp, int proto) { (void) attrp; - return proto == PTHREAD_PRIO_NONE ? 0 : - proto != PTHREAD_PRIO_INHERIT && - proto != PTHREAD_PRIO_PROTECT ? EINVAL : ENOTSUP; + return (proto == PTHREAD_PRIO_NONE + ? 0 + : (proto != PTHREAD_PRIO_INHERIT + && proto != PTHREAD_PRIO_PROTECT) ? EINVAL : ENOTSUP); } diff --git a/sysdeps/mach/hurd/ioctl.c b/sysdeps/mach/hurd/ioctl.c index 625333110f..cd630e179e 100644 --- a/sysdeps/mach/hurd/ioctl.c +++ b/sysdeps/mach/hurd/ioctl.c @@ -199,9 +199,9 @@ __ioctl (int fd, unsigned long int request, ...) return MIG_TYPE_ERROR; #ifdef MACH_MSG_TYPE_BIT - if (msg.header_typecheck.RetCodeType != - ((union { mach_msg_type_t t; int i; }) - { t: io2mach_type (1, _IOTS (msg.header.RetCode)) }).i) + if (msg.header_typecheck.RetCodeType + != ((union { mach_msg_type_t t; int i; }) + { t: io2mach_type (1, _IOTS (msg.header.RetCode)) }).i) return MIG_TYPE_ERROR; #endif return msg.header.RetCode; diff --git a/sysdeps/mach/hurd/mmap.c b/sysdeps/mach/hurd/mmap.c index 071e3c39bf..8eb741f7e1 100644 --- a/sysdeps/mach/hurd/mmap.c +++ b/sysdeps/mach/hurd/mmap.c @@ -120,8 +120,8 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) /* Remove extra reference. */ __mach_port_deallocate (__mach_task_self (), memobj); } - else if (wobj == MACH_PORT_NULL && /* Not writable by mapping. */ - !(flags & MAP_SHARED)) + else if (wobj == MACH_PORT_NULL /* Not writable by mapping. */ + && !(flags & MAP_SHARED)) /* The file can only be mapped for reading. Since we are making a private mapping, we will never try to write the object anyway, so we don't care. */ diff --git a/sysdeps/mach/hurd/ptrace.c b/sysdeps/mach/hurd/ptrace.c index 3778726f1d..a47f7b508b 100644 --- a/sysdeps/mach/hurd/ptrace.c +++ b/sysdeps/mach/hurd/ptrace.c @@ -178,8 +178,8 @@ ptrace (enum __ptrace_request request, ... ) if (! err) { err = __msg_set_init_int (msgport, task, INIT_TRACEMASK, - request == PTRACE_DETACH ? 0 : - ~(sigset_t) 0); + request == PTRACE_DETACH ? 0 + : ~(sigset_t) 0); if (! err) { if (request == PTRACE_ATTACH) diff --git a/sysdeps/mach/hurd/spawni.c b/sysdeps/mach/hurd/spawni.c index 4e818ec3e6..af0b9930f6 100644 --- a/sysdeps/mach/hurd/spawni.c +++ b/sysdeps/mach/hurd/spawni.c @@ -264,8 +264,8 @@ __spawni (pid_t *pid, const char *file, { error_t use_init_port (int which, error_t (*operate) (mach_port_t)) { - return (which == INIT_PORT_CWDIR ? (*operate) (startdir) : - child_init_port (which, operate)); + return (which == INIT_PORT_CWDIR ? (*operate) (startdir) + : child_init_port (which, operate)); } return __hurd_file_name_lookup (&use_init_port, &child_fd, 0, |