Fix coding style

25 files changed, 49 insertions, 49 deletions

diff --git a/sysdeps/generic/timer_routines.h b/sysdeps/generic/timer_routines.h
index c506ce9..42cd890 100644
--- a/sysdeps/generic/timer_routines.h
+++ b/sysdeps/generic/timer_routines.h
@@ -33,15 +33,15 @@ thread_attr_compare (const pthread_attr_t * left, const pthread_attr_t * right)
   struct __pthread_attr *ileft = (struct __pthread_attr *) left;
   struct __pthread_attr *iright = (struct __pthread_attr *) right;
 
-  return (ileft->__schedparam.sched_priority
-	    == iright->__schedparam.sched_priority
-	  && ileft->__stackaddr == iright->__stackaddr
-	  && ileft->__stacksize == iright->__stacksize
-	  && ileft->__guardsize == iright->__guardsize
-	  && ileft->__detachstate == iright->__detachstate
-	  && ileft->__inheritsched == iright->__inheritsched
-	  && ileft->__contentionscope == iright->__contentionscope
-	  && ileft->__schedpolicy == iright->__schedpolicy);
+  return ileft->__schedparam.sched_priority
+	   == iright->__schedparam.sched_priority
+	 && ileft->__stackaddr == iright->__stackaddr
+	 && ileft->__stacksize == iright->__stacksize
+	 && ileft->__guardsize == iright->__guardsize
+	 && ileft->__detachstate == iright->__detachstate
+	 && ileft->__inheritsched == iright->__inheritsched
+	 && ileft->__contentionscope == iright->__contentionscope
+	 && ileft->__schedpolicy == iright->__schedpolicy;
 }
 
 #endif /* timer_routines.h */
diff --git a/sysdeps/mach/hurd/pt-hurd-cond-wait.c b/sysdeps/mach/hurd/pt-hurd-cond-wait.c
index 1915b92..2f2b6c2 100644
--- a/sysdeps/mach/hurd/pt-hurd-cond-wait.c
+++ b/sysdeps/mach/hurd/pt-hurd-cond-wait.c
@@ -34,7 +34,7 @@ __pthread_hurd_cond_wait_np (pthread_cond_t *cond, pthread_mutex_t *mutex)
   error_t err;
 
   err = __pthread_hurd_cond_timedwait_internal (cond, mutex, NULL);
-  return (err == EINTR);
+  return err == EINTR;
 }
 
 strong_alias (__pthread_hurd_cond_wait_np, pthread_hurd_cond_wait_np);
diff --git a/sysdeps/mach/hurd/pt-mutex-consistent.c b/sysdeps/mach/hurd/pt-mutex-consistent.c
index 9111c12..de9b5a2 100644
--- a/sysdeps/mach/hurd/pt-mutex-consistent.c
+++ b/sysdeps/mach/hurd/pt-mutex-consistent.c
@@ -41,7 +41,7 @@ pthread_mutex_consistent (pthread_mutex_t *mtxp)
       ret = 0;
     }
 
-  return (ret);
+  return ret;
 }
 
 weak_alias (pthread_mutex_consistent, pthread_mutex_consistent_np)
diff --git a/sysdeps/mach/hurd/pt-mutex-destroy.c b/sysdeps/mach/hurd/pt-mutex-destroy.c
index fbdfe4c..08c6773 100644
--- a/sysdeps/mach/hurd/pt-mutex-destroy.c
+++ b/sysdeps/mach/hurd/pt-mutex-destroy.c
@@ -28,10 +28,10 @@ _pthread_mutex_destroy (pthread_mutex_t *mtxp)
 {
   atomic_read_barrier ();
   if (*(volatile unsigned int *) &mtxp->__lock != 0)
-    return (EBUSY);
+    return EBUSY;
 
   mtxp->__type = -1;
-  return (0);
+  return 0;
 }
 
 strong_alias (_pthread_mutex_destroy, pthread_mutex_destroy)
diff --git a/sysdeps/mach/hurd/pt-mutex-getprioceiling.c b/sysdeps/mach/hurd/pt-mutex-getprioceiling.c
index 61f1547..b6d91e5 100644
--- a/sysdeps/mach/hurd/pt-mutex-getprioceiling.c
+++ b/sysdeps/mach/hurd/pt-mutex-getprioceiling.c
@@ -28,7 +28,7 @@ pthread_mutex_getprioceiling (const pthread_mutex_t *mtxp, int *clp)
 {
   (void) mtxp;
   (void) clp;
-  return (ENOSYS);
+  return ENOSYS;
 }
 
 stub_warning (pthread_mutex_getprioceiling)
diff --git a/sysdeps/mach/hurd/pt-mutex-init.c b/sysdeps/mach/hurd/pt-mutex-init.c
index ff614f6..cdefbb1 100644
--- a/sysdeps/mach/hurd/pt-mutex-init.c
+++ b/sysdeps/mach/hurd/pt-mutex-init.c
@@ -49,7 +49,7 @@ _pthread_mutex_init (pthread_mutex_t *mtxp, const pthread_mutexattr_t *attrp)
   mtxp->__cnt = 0;
   mtxp->__lock = 0;
 
-  return (0);
+  return 0;
 }
 
 strong_alias (_pthread_mutex_init, pthread_mutex_init)
diff --git a/sysdeps/mach/hurd/pt-mutex-lock.c b/sysdeps/mach/hurd/pt-mutex-lock.c
index 8ebb4f6..7256ec5 100644
--- a/sysdeps/mach/hurd/pt-mutex-lock.c
+++ b/sysdeps/mach/hurd/pt-mutex-lock.c
@@ -41,10 +41,10 @@ __pthread_mutex_lock (pthread_mutex_t *mtxp)
       if (mtx_owned_p (mtxp, self, flags))
 	{
 	  if (__glibc_unlikely (mtxp->__cnt + 1 == 0))
-	    return (EAGAIN);
+	    return EAGAIN;
 
 	  ++mtxp->__cnt;
-	  return (ret);
+	  return ret;
 	}
 
       lll_lock (&mtxp->__lock, flags);
@@ -55,7 +55,7 @@ __pthread_mutex_lock (pthread_mutex_t *mtxp)
     case PT_MTX_ERRORCHECK:
       self = _pthread_self ();
       if (mtx_owned_p (mtxp, self, flags))
-	return (EDEADLK);
+	return EDEADLK;
 
       lll_lock (&mtxp->__lock, flags);
       mtx_set_owner (mtxp, self, flags);
@@ -73,7 +73,7 @@ __pthread_mutex_lock (pthread_mutex_t *mtxp)
       break;
     }
 
-  return (ret);
+  return ret;
 }
 
 strong_alias (__pthread_mutex_lock, _pthread_mutex_lock)
diff --git a/sysdeps/mach/hurd/pt-mutex-setprioceiling.c b/sysdeps/mach/hurd/pt-mutex-setprioceiling.c
index 3d6504e..9920e29 100644
--- a/sysdeps/mach/hurd/pt-mutex-setprioceiling.c
+++ b/sysdeps/mach/hurd/pt-mutex-setprioceiling.c
@@ -29,7 +29,7 @@ pthread_mutex_setprioceiling (pthread_mutex_t *mtxp, int cl, int *prp)
   (void) mtxp;
   (void) cl;
   (void) prp;
-  return (ENOSYS);
+  return ENOSYS;
 }
 
 stub_warning (pthread_mutex_setprioceiling)
diff --git a/sysdeps/mach/hurd/pt-mutex-timedlock.c b/sysdeps/mach/hurd/pt-mutex-timedlock.c
index b6308f8..4119291 100644
--- a/sysdeps/mach/hurd/pt-mutex-timedlock.c
+++ b/sysdeps/mach/hurd/pt-mutex-timedlock.c
@@ -40,7 +40,7 @@ pthread_mutex_timedlock (pthread_mutex_t *mtxp, const struct timespec *tsp)
       if (mtx_owned_p (mtxp, self, flags))
 	{
 	  if (__glibc_unlikely (mtxp->__cnt + 1 == 0))
-	    return (EAGAIN);
+	    return EAGAIN;
 
 	  ++mtxp->__cnt;
 	  ret = 0;
@@ -74,5 +74,5 @@ pthread_mutex_timedlock (pthread_mutex_t *mtxp, const struct timespec *tsp)
       break;
     }
 
-  return (ret);
+  return ret;
 }
diff --git a/sysdeps/mach/hurd/pt-mutex-transfer-np.c b/sysdeps/mach/hurd/pt-mutex-transfer-np.c
index 618ab5b..15a3057 100644
--- a/sysdeps/mach/hurd/pt-mutex-transfer-np.c
+++ b/sysdeps/mach/hurd/pt-mutex-transfer-np.c
@@ -30,9 +30,9 @@ __pthread_mutex_transfer_np (pthread_mutex_t *mtxp, pthread_t th)
   struct __pthread *pt = __pthread_getid (th);
 
   if (pt == NULL)
-    return (ESRCH);
+    return ESRCH;
   else if (pt == self)
-    return (0);
+    return 0;
 
   int ret = 0;
   int flags = mtxp->__flags & GSYNC_SHARED;
@@ -69,7 +69,7 @@ __pthread_mutex_transfer_np (pthread_mutex_t *mtxp, pthread_t th)
       ret = EINVAL;
     }
 
-  return (ret);
+  return ret;
 }
 
 weak_alias (__pthread_mutex_transfer_np, pthread_mutex_transfer_np)
diff --git a/sysdeps/mach/hurd/pt-mutex-trylock.c b/sysdeps/mach/hurd/pt-mutex-trylock.c
index 11d65bd..6954917 100644
--- a/sysdeps/mach/hurd/pt-mutex-trylock.c
+++ b/sysdeps/mach/hurd/pt-mutex-trylock.c
@@ -42,7 +42,7 @@ __pthread_mutex_trylock (pthread_mutex_t *mtxp)
       if (mtx_owned_p (mtxp, self, mtxp->__flags))
 	{
 	  if (__glibc_unlikely (mtxp->__cnt + 1 == 0))
-	    return (EAGAIN);
+	    return EAGAIN;
 
 	  ++mtxp->__cnt;
 	  ret = 0;
@@ -77,7 +77,7 @@ __pthread_mutex_trylock (pthread_mutex_t *mtxp)
       break;
     }
 
-  return (ret);
+  return ret;
 }
 
 strong_alias (__pthread_mutex_trylock, _pthread_mutex_trylock)
diff --git a/sysdeps/mach/hurd/pt-mutex-unlock.c b/sysdeps/mach/hurd/pt-mutex-unlock.c
index de3ae9d..86f7dba 100644
--- a/sysdeps/mach/hurd/pt-mutex-unlock.c
+++ b/sysdeps/mach/hurd/pt-mutex-unlock.c
@@ -84,7 +84,7 @@ __pthread_mutex_unlock (pthread_mutex_t *mtxp)
       break;
     }
 
-  return (ret);
+  return ret;
 }
 
 strong_alias (__pthread_mutex_unlock, _pthread_mutex_unlock)
diff --git a/sysdeps/mach/hurd/pt-mutex.h b/sysdeps/mach/hurd/pt-mutex.h
index cbf774e..c6d6623 100644
--- a/sysdeps/mach/hurd/pt-mutex.h
+++ b/sysdeps/mach/hurd/pt-mutex.h
@@ -27,20 +27,20 @@
  * is bound in the function this is called from. */
 #define ROBUST_LOCK(self, mtxp, cb, ...)   \
   if (mtxp->__owner_id == NOTRECOVERABLE_ID)   \
-    return (ENOTRECOVERABLE);   \
+    return ENOTRECOVERABLE;   \
   else if (mtxp->__owner_id == self->thread &&   \
       __getpid () == (int)(mtxp->__lock & LLL_OWNER_MASK))   \
     {   \
       if (mtxp->__type == PT_MTX_RECURSIVE)   \
         {   \
           if (__glibc_unlikely (mtxp->__cnt + 1 == 0))   \
-            return (EAGAIN);   \
+            return EAGAIN;   \
           \
           ++mtxp->__cnt;   \
-          return (0);   \
+          return 0;   \
         }   \
       else if (mtxp->__type == PT_MTX_ERRORCHECK)   \
-        return (EDEADLK);   \
+        return EDEADLK;   \
     }   \
   \
   ret = cb (&mtxp->__lock, ##__VA_ARGS__);   \
diff --git a/sysdeps/mach/hurd/pt-mutexattr-destroy.c b/sysdeps/mach/hurd/pt-mutexattr-destroy.c
index 75c7678..61e3e60 100644
--- a/sysdeps/mach/hurd/pt-mutexattr-destroy.c
+++ b/sysdeps/mach/hurd/pt-mutexattr-destroy.c
@@ -27,7 +27,7 @@ int
 __pthread_mutexattr_destroy (pthread_mutexattr_t *attrp)
 {
   (void) attrp;
-  return (0);
+  return 0;
 }
 
 weak_alias (__pthread_mutexattr_destroy, pthread_mutexattr_destroy)
diff --git a/sysdeps/mach/hurd/pt-mutexattr-getprioceiling.c b/sysdeps/mach/hurd/pt-mutexattr-getprioceiling.c
index 64e5287..a0f54ea 100644
--- a/sysdeps/mach/hurd/pt-mutexattr-getprioceiling.c
+++ b/sysdeps/mach/hurd/pt-mutexattr-getprioceiling.c
@@ -28,7 +28,7 @@ pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *ap, int *clp)
 {
   (void) ap;
   (void) clp;
-  return (ENOSYS);
+  return ENOSYS;
 }
 
 stub_warning (pthread_mutexattr_getprioceiling)
diff --git a/sysdeps/mach/hurd/pt-mutexattr-getprotocol.c b/sysdeps/mach/hurd/pt-mutexattr-getprotocol.c
index 4d30873..46e4b55 100644
--- a/sysdeps/mach/hurd/pt-mutexattr-getprotocol.c
+++ b/sysdeps/mach/hurd/pt-mutexattr-getprotocol.c
@@ -27,5 +27,5 @@ int
 pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attrp, int *ptp)
 {
   *ptp = attrp->__protocol;
-  return (0);
+  return 0;
 }
diff --git a/sysdeps/mach/hurd/pt-mutexattr-getpshared.c b/sysdeps/mach/hurd/pt-mutexattr-getpshared.c
index e97dd9a..8c048f8 100644
--- a/sysdeps/mach/hurd/pt-mutexattr-getpshared.c
+++ b/sysdeps/mach/hurd/pt-mutexattr-getpshared.c
@@ -27,5 +27,5 @@ int
 pthread_mutexattr_getpshared (const pthread_mutexattr_t *attrp, int *outp)
 {
   *outp = attrp->__pshared;
-  return (0);
+  return 0;
 }
diff --git a/sysdeps/mach/hurd/pt-mutexattr-getrobust.c b/sysdeps/mach/hurd/pt-mutexattr-getrobust.c
index d55a1b8..e584634 100644
--- a/sysdeps/mach/hurd/pt-mutexattr-getrobust.c
+++ b/sysdeps/mach/hurd/pt-mutexattr-getrobust.c
@@ -28,7 +28,7 @@ pthread_mutexattr_getrobust (const pthread_mutexattr_t *attrp, int *outp)
 {
   *outp = (attrp->__prioceiling & PTHREAD_MUTEX_ROBUST) ?
       PTHREAD_MUTEX_ROBUST : PTHREAD_MUTEX_STALLED;
-  return (0);
+  return 0;
 }
 
 weak_alias (pthread_mutexattr_getrobust, pthread_mutexattr_getrobust_np)
diff --git a/sysdeps/mach/hurd/pt-mutexattr-gettype.c b/sysdeps/mach/hurd/pt-mutexattr-gettype.c
index 8f9d882..780ea0b 100644
--- a/sysdeps/mach/hurd/pt-mutexattr-gettype.c
+++ b/sysdeps/mach/hurd/pt-mutexattr-gettype.c
@@ -27,5 +27,5 @@ int
 pthread_mutexattr_gettype (const pthread_mutexattr_t *attrp, int *outp)
 {
   *outp = attrp->__mutex_type;
-  return (0);
+  return 0;
 }
diff --git a/sysdeps/mach/hurd/pt-mutexattr-init.c b/sysdeps/mach/hurd/pt-mutexattr-init.c
index 0e371a0..9077be8 100644
--- a/sysdeps/mach/hurd/pt-mutexattr-init.c
+++ b/sysdeps/mach/hurd/pt-mutexattr-init.c
@@ -34,6 +34,6 @@ int
 __pthread_mutexattr_init (pthread_mutexattr_t *attrp)
 {
   *attrp = dfl_attr;
-  return (0);
+  return 0;
 }
 weak_alias (__pthread_mutexattr_init, pthread_mutexattr_init)
diff --git a/sysdeps/mach/hurd/pt-mutexattr-setprioceiling.c b/sysdeps/mach/hurd/pt-mutexattr-setprioceiling.c
index 81d7493..8264faa 100644
--- a/sysdeps/mach/hurd/pt-mutexattr-setprioceiling.c
+++ b/sysdeps/mach/hurd/pt-mutexattr-setprioceiling.c
@@ -28,7 +28,7 @@ pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attrp, int cl)
 {
   (void) attrp;
   (void) cl;
-  return (ENOSYS);
+  return ENOSYS;
 }
 
 stub_warning (pthread_mutexattr_setprioceiling)
diff --git a/sysdeps/mach/hurd/pt-mutexattr-setprotocol.c b/sysdeps/mach/hurd/pt-mutexattr-setprotocol.c
index b472024..6045b70 100644
--- a/sysdeps/mach/hurd/pt-mutexattr-setprotocol.c
+++ b/sysdeps/mach/hurd/pt-mutexattr-setprotocol.c
@@ -27,7 +27,7 @@ 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/pt-mutexattr-setpshared.c b/sysdeps/mach/hurd/pt-mutexattr-setpshared.c
index c399e22..09b7a57 100644
--- a/sysdeps/mach/hurd/pt-mutexattr-setpshared.c
+++ b/sysdeps/mach/hurd/pt-mutexattr-setpshared.c
@@ -27,8 +27,8 @@ int
 pthread_mutexattr_setpshared (pthread_mutexattr_t *attrp, int pshared)
 {
   if (pshared != PTHREAD_PROCESS_PRIVATE && pshared != PTHREAD_PROCESS_SHARED)
-    return (EINVAL);
+    return EINVAL;
 
   attrp->__pshared = pshared;
-  return (0);
+  return 0;
 }
diff --git a/sysdeps/mach/hurd/pt-mutexattr-setrobust.c b/sysdeps/mach/hurd/pt-mutexattr-setrobust.c
index b61dea5..2de3afd 100644
--- a/sysdeps/mach/hurd/pt-mutexattr-setrobust.c
+++ b/sysdeps/mach/hurd/pt-mutexattr-setrobust.c
@@ -27,10 +27,10 @@ int
 pthread_mutexattr_setrobust (pthread_mutexattr_t *attrp, int robust)
 {
   if (robust != PTHREAD_MUTEX_ROBUST && robust != PTHREAD_MUTEX_STALLED)
-    return (EINVAL);
+    return EINVAL;
 
   attrp->__prioceiling |= robust;
-  return (0);
+  return 0;
 }
 
 weak_alias (pthread_mutexattr_setrobust, pthread_mutexattr_setrobust_np)
diff --git a/sysdeps/mach/hurd/pt-mutexattr-settype.c b/sysdeps/mach/hurd/pt-mutexattr-settype.c
index f945b78..2a95c05 100644
--- a/sysdeps/mach/hurd/pt-mutexattr-settype.c
+++ b/sysdeps/mach/hurd/pt-mutexattr-settype.c
@@ -27,9 +27,9 @@ int
 __pthread_mutexattr_settype (pthread_mutexattr_t *attrp, int type)
 {
   if (type < 0 || type > __PTHREAD_MUTEX_RECURSIVE)
-    return (EINVAL);
+    return EINVAL;
 
   attrp->__mutex_type = type;
-  return (0);
+  return 0;
 }
 weak_alias (__pthread_mutexattr_settype, pthread_mutexattr_settype)