summary refs log tree commit diff
path: root/hurd
diff options
context:
space:
mode:
Diffstat (limited to 'hurd')
-rw-r--r--hurd/hurdinit.c8
-rw-r--r--hurd/hurdkill.c4
-rw-r--r--hurd/hurdlookup.c4
-rw-r--r--hurd/hurdsig.c24
-rw-r--r--hurd/lookup-at.c12
-rw-r--r--hurd/lookup-retry.c8
-rw-r--r--hurd/port2fd.c5
7 files changed, 33 insertions, 32 deletions
diff --git a/hurd/hurdinit.c b/hurd/hurdinit.c
index 773bb1c37f..f4a3607ae6 100644
--- a/hurd/hurdinit.c
+++ b/hurd/hurdinit.c
@@ -198,10 +198,10 @@ _hurd_setproc (process_t procserver)
 
   /* Tell the proc server where our args and environment are.  */
   if (err = __proc_set_arg_locations (procserver,
-				      _hide_arguments ? 0 :
-				      (vm_address_t) __libc_argv,
-				      _hide_environment ? 0 :
-				      (vm_address_t) __environ))
+				      _hide_arguments ? 0
+				      : (vm_address_t) __libc_argv,
+				      _hide_environment ? 0
+				      : (vm_address_t) __environ))
     return err;
 
   /* Those calls worked, so the port looks good.  */
diff --git a/hurd/hurdkill.c b/hurd/hurdkill.c
index 8b2743f0e9..cd67f9b9bd 100644
--- a/hurd/hurdkill.c
+++ b/hurd/hurdkill.c
@@ -40,8 +40,8 @@ _hurd_sig_post (pid_t pid, int sig, mach_port_t arg_refport)
       err = HURD_MSGPORT_RPC (__proc_getmsgport (proc, pid, &msgport),
 			      (refport = arg_refport, 0), 0,
 			      /* If no message port we cannot send signals.  */
-			      msgport == MACH_PORT_NULL ? EPERM :
-			      __msg_sig_post (msgport, sig, 0, refport));
+			      msgport == MACH_PORT_NULL ? EPERM
+			      : __msg_sig_post (msgport, sig, 0, refport));
       if (! err)
 	delivered = 1;
     }
diff --git a/hurd/hurdlookup.c b/hurd/hurdlookup.c
index 7be42afd12..983f6a6506 100644
--- a/hurd/hurdlookup.c
+++ b/hurd/hurdlookup.c
@@ -268,8 +268,8 @@ __file_name_lookup_under (file_t startdir,
 
   error_t use_init_port (int which, error_t (*operate) (mach_port_t))
     {
-      return (which == INIT_PORT_CWDIR ? (*operate) (startdir) :
-	      _hurd_ports_use (which, operate));
+      return (which == INIT_PORT_CWDIR ? (*operate) (startdir)
+	      : _hurd_ports_use (which, operate));
     }
 
   err = __hurd_file_name_lookup (&use_init_port, &__getdport, 0,
diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
index 86c1179c02..1b511d1e8f 100644
--- a/hurd/hurdsig.c
+++ b/hurd/hurdsig.c
@@ -538,8 +538,8 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss,
       assert_perror (err);
       for (i = 0; i < nthreads; ++i)
 	{
-	  if (threads[i] != _hurd_msgport_thread &&
-	      (act != handle || threads[i] != ss->thread))
+	  if (threads[i] != _hurd_msgport_thread
+	      && (act != handle || threads[i] != ss->thread))
 	    {
 	      err = __thread_resume (threads[i]);
 	      assert_perror (err);
@@ -715,9 +715,9 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss,
 	}
     }
 
-  if (_hurd_orphaned && act == stop &&
-      (__sigmask (signo) & (__sigmask (SIGTTIN) | __sigmask (SIGTTOU) |
-			    __sigmask (SIGTSTP))))
+  if (_hurd_orphaned && act == stop
+      && (__sigmask (signo) & (__sigmask (SIGTTIN) | __sigmask (SIGTTOU)
+			       | __sigmask (SIGTSTP))))
     {
       /* If we would ordinarily stop for a job control signal, but we are
 	 orphaned so noone would ever notice and continue us again, we just
@@ -728,9 +728,9 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss,
     }
 
   /* Handle receipt of a blocked signal, or any signal while stopped.  */
-  if (act != ignore &&		/* Signals ignored now are forgotten now.  */
-      __sigismember (&ss->blocked, signo) ||
-      (signo != SIGKILL && _hurd_stopped))
+  if (act != ignore		/* Signals ignored now are forgotten now.  */
+      && __sigismember (&ss->blocked, signo)
+      || (signo != SIGKILL && _hurd_stopped))
     {
       mark_pending ();
       act = ignore;
@@ -1368,10 +1368,10 @@ reauth_proc (mach_port_t new)
   ref = __mach_reply_port ();
   if (! HURD_PORT_USE (&_hurd_ports[INIT_PORT_PROC],
 		       __proc_reauthenticate (port, ref,
-					      MACH_MSG_TYPE_MAKE_SEND) ||
-		       __auth_user_authenticate (new, ref,
-						 MACH_MSG_TYPE_MAKE_SEND,
-						 &ignore))
+					      MACH_MSG_TYPE_MAKE_SEND)
+		       || __auth_user_authenticate (new, ref,
+						    MACH_MSG_TYPE_MAKE_SEND,
+						    &ignore))
       && ignore != MACH_PORT_NULL)
     __mach_port_deallocate (__mach_task_self (), ignore);
   __mach_port_destroy (__mach_task_self (), ref);
diff --git a/hurd/lookup-at.c b/hurd/lookup-at.c
index 3e6980f949..43430b5762 100644
--- a/hurd/lookup-at.c
+++ b/hurd/lookup-at.c
@@ -59,8 +59,8 @@ __file_name_lookup_at (int fd, int at_flags,
   file_t startdir;
   error_t use_init_port (int which, error_t (*operate) (mach_port_t))
     {
-      return (which == INIT_PORT_CWDIR ? (*operate) (startdir) :
-	      _hurd_ports_use (which, operate));
+      return (which == INIT_PORT_CWDIR ? (*operate) (startdir)
+	      : _hurd_ports_use (which, operate));
     }
 
   err = HURD_DPORT_USE (fd, (startdir = port,
@@ -89,8 +89,8 @@ __file_name_split_at (int fd, const char *file_name, char **name)
   file_t startdir;
   error_t use_init_port (int which, error_t (*operate) (mach_port_t))
   {
-    return (which == INIT_PORT_CWDIR ? (*operate) (startdir) :
-	    _hurd_ports_use (which, operate));
+    return (which == INIT_PORT_CWDIR ? (*operate) (startdir)
+	    : _hurd_ports_use (which, operate));
   }
 
   err = HURD_DPORT_USE (fd, (startdir = port,
@@ -114,8 +114,8 @@ __directory_name_split_at (int fd, const char *directory_name, char **name)
   file_t startdir;
   error_t use_init_port (int which, error_t (*operate) (mach_port_t))
     {
-      return (which == INIT_PORT_CWDIR ? (*operate) (startdir) :
-	      _hurd_ports_use (which, operate));
+      return (which == INIT_PORT_CWDIR ? (*operate) (startdir)
+	      : _hurd_ports_use (which, operate));
     }
 
   err = HURD_DPORT_USE (fd, (startdir = port,
diff --git a/hurd/lookup-retry.c b/hurd/lookup-retry.c
index 06cf8393a8..9c49075fe1 100644
--- a/hurd/lookup-retry.c
+++ b/hurd/lookup-retry.c
@@ -213,11 +213,11 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port)
 		  int save = errno;
 		  errno = 0;
 		  fd = (int) __strtoul_internal (&retryname[3], &end, 10, 0);
-		  if (end == NULL || errno || /* Malformed number.  */
+		  if (end == NULL || errno /* Malformed number.  */
 		      /* Check for excess text after the number.  A slash
 			 is valid; it ends the component.  Anything else
 			 does not name a numeric file descriptor.  */
-		      (*end != '/' && *end != '\0'))
+		      || (*end != '/' && *end != '\0'))
 		    {
 		      errno = save;
 		      err = ENOENT;
@@ -327,8 +327,8 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port)
 	      break;
 
 	    case 'p':
-	      if (retryname[1] == 'i' && retryname[2] == 'd' &&
-		  (retryname[3] == '/' || retryname[3] == 0))
+	      if (retryname[1] == 'i' && retryname[2] == 'd'
+		  && (retryname[3] == '/' || retryname[3] == 0))
 		{
 		  char *p, buf[1024];  /* XXX */
 		  size_t len;
diff --git a/hurd/port2fd.c b/hurd/port2fd.c
index b9862c79bf..f500202c91 100644
--- a/hurd/port2fd.c
+++ b/hurd/port2fd.c
@@ -34,8 +34,9 @@ _hurd_port2fd (struct hurd_fd *d, io_t dport, int flags)
   if (!(flags & O_IGNORE_CTTY))
     __USEPORT (CTTYID,
 	       ({
-		 if (port != MACH_PORT_NULL && /* Do we have a ctty? */
-		     ! __term_getctty (dport, &cttyid))	/* Could this be it? */
+		 if (port != MACH_PORT_NULL /* Do we have a ctty? */
+		     && ! __term_getctty (dport, &cttyid))
+		   /* Could this be it? */
 		   {
 		     __mach_port_deallocate (__mach_task_self (), cttyid);
 		     /* This port is capable of being a controlling tty.
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-10 22:32:41 +0000