Add braces to silence gcc warnings.

3 files changed, 74 insertions, 55 deletions

diff --git a/trans/ChangeLog b/trans/ChangeLog
index 712dd1c3..14dee01f 100644
--- a/trans/ChangeLog
+++ b/trans/ChangeLog
@@ -1,3 +1,10 @@
+1998-10-20  Roland McGrath  <roland@baalperazim.frob.com>
+
+	* fifo.c (open_hook: WAIT): Add braces to silence gcc warning.
+	(trivfs_S_io_select): Likewise.
+	* new-fifo.c (fifo_trans_open): Likewise.
+	(trivfs_S_io_select): Likewise.
+
 1998-07-20  Roland McGrath  <roland@baalperazim.frob.com>
 
 	* firmlink.c (main): Fix return type to int, and use return.
diff --git a/trans/fifo.c b/trans/fifo.c
index 0646db02..4ad1e1db 100644
--- a/trans/fifo.c
+++ b/trans/fifo.c
@@ -123,15 +123,17 @@ open_hook (struct trivfs_peropen *po)
       mutex_lock (&active_fifo_lock);
 
 /* Wait until the active fifo has changed so that CONDITION is true.  */
-#define WAIT(condition, noblock_err)					     \
-  while (!err && !(condition)) 						     \
-    if (flags & O_NONBLOCK) 						     \
-      {			 						     \
-        err = noblock_err; 						     \
-        break;		 						     \
-      }			 						     \
-    else if (hurd_condition_wait (&active_fifo_changed, &active_fifo_lock))  \
-      err = EINTR;
+#define WAIT(condition, noblock_err)					      \
+  while (!err && !(condition))						      \
+    {									      \
+      if (flags & O_NONBLOCK)						      \
+	{								      \
+	  err = noblock_err;						      \
+	  break;							      \
+	}								      \
+      else if (hurd_condition_wait (&active_fifo_changed, &active_fifo_lock)) \
+	err = EINTR;							      \
+    }
 
       if (flags & O_READ)
 	/* When opening for read, what we do depends on what mode this server
@@ -415,26 +417,30 @@ trivfs_S_io_select (struct trivfs_protid *cred,
   pipe = cred->po->hook;
 
   if (*select_type & SELECT_READ)
-    if (cred->po->openmodes & O_READ)
-      {
-	mutex_lock (&pipe->lock);
-	if (pipe_wait_readable (pipe, 1, 1) != EWOULDBLOCK)
-	  ready |= SELECT_READ; /* Data immediately readable (or error). */
-	mutex_unlock (&pipe->lock);
-      }
-    else
-      ready |= SELECT_READ;	/* Error immediately available...  */
+    {
+      if (cred->po->openmodes & O_READ)
+	{
+	  mutex_lock (&pipe->lock);
+	  if (pipe_wait_readable (pipe, 1, 1) != EWOULDBLOCK)
+	    ready |= SELECT_READ; /* Data immediately readable (or error). */
+	  mutex_unlock (&pipe->lock);
+	}
+      else
+	ready |= SELECT_READ;	/* Error immediately available...  */
+    }
 
   if (*select_type & SELECT_WRITE)
-    if (cred->po->openmodes & O_WRITE)
-      {
-	mutex_lock (&pipe->lock);
-	if (pipe_wait_writable (pipe, 1) != EWOULDBLOCK)
-	  ready |= SELECT_WRITE; /* Data immediately writable (or error). */
-	mutex_unlock (&pipe->lock);
-      }
-    else
-      ready |= SELECT_WRITE;	/* Error immediately available...  */
+    {
+      if (cred->po->openmodes & O_WRITE)
+	{
+	  mutex_lock (&pipe->lock);
+	  if (pipe_wait_writable (pipe, 1) != EWOULDBLOCK)
+	    ready |= SELECT_WRITE; /* Data immediately writable (or error). */
+	  mutex_unlock (&pipe->lock);
+	}
+      else
+	ready |= SELECT_WRITE;	/* Error immediately available...  */
+    }
 
   if (ready)
     *select_type = ready;
diff --git a/trans/new-fifo.c b/trans/new-fifo.c
index 9266b1e5..203a7d4d 100644
--- a/trans/new-fifo.c
+++ b/trans/new-fifo.c
@@ -245,16 +245,18 @@ fifo_trans_open (struct fifo_trans *trans, int flags, void **hook)
       mutex_lock (&trans->active_fifo_lock);
 
 /* Wait until the active fifo has changed so that CONDITION is true.  */
-#define WAIT(condition, noblock_err)					     \
-  while (!err && !(condition)) 						     \
-    if (flags & O_NONBLOCK) 						     \
-      {			 						     \
-        err = noblock_err; 						     \
-        break;		 						     \
-      }			 						     \
-    else if (hurd_condition_wait (&trans->active_fifo_changed,		     \
-				  &trans->active_fifo_lock))		     \
-      err = EINTR;
+#define WAIT(condition, noblock_err)					      \
+  while (!err && !(condition))						      \
+    {									      \
+      if (flags & O_NONBLOCK)						      \
+	{								      \
+	  err = noblock_err;						      \
+	  break;							      \
+	}								      \
+      else if (hurd_condition_wait (&trans->active_fifo_changed,	      \
+				    &trans->active_fifo_lock))		      \
+	err = EINTR;							      \
+    }
 
       if (flags & O_READ)
 	/* When opening for read, what we do depends on what mode this server
@@ -600,26 +602,30 @@ trivfs_S_io_select (struct trivfs_protid *cred,
   pipe = cred->po->hook;
 
   if (*select_type & SELECT_READ)
-    if (cred->po->openmodes & O_READ)
-      {
-	mutex_lock (&pipe->lock);
-	if (pipe_wait_readable (pipe, 1, 1) != EWOULDBLOCK)
-	  ready |= SELECT_READ; /* Data immediately readable (or error). */
-	mutex_unlock (&pipe->lock);
-      }
-    else
-      ready |= SELECT_READ;	/* Error immediately available...  */
+    {
+      if (cred->po->openmodes & O_READ)
+	{
+	  mutex_lock (&pipe->lock);
+	  if (pipe_wait_readable (pipe, 1, 1) != EWOULDBLOCK)
+	    ready |= SELECT_READ; /* Data immediately readable (or error). */
+	  mutex_unlock (&pipe->lock);
+	}
+      else
+	ready |= SELECT_READ;	/* Error immediately available...  */
+    }
 
   if (*select_type & SELECT_WRITE)
-    if (cred->po->openmodes & O_WRITE)
-      {
-	mutex_lock (&pipe->lock);
-	if (pipe_wait_writable (pipe, 1) != EWOULDBLOCK)
-	  ready |= SELECT_WRITE; /* Data immediately writable (or error). */
-	mutex_unlock (&pipe->lock);
-      }
-    else
-      ready |= SELECT_WRITE;	/* Error immediately available...  */
+    {
+      if (cred->po->openmodes & O_WRITE)
+	{
+	  mutex_lock (&pipe->lock);
+	  if (pipe_wait_writable (pipe, 1) != EWOULDBLOCK)
+	    ready |= SELECT_WRITE; /* Data immediately writable (or error). */
+	  mutex_unlock (&pipe->lock);
+	}
+      else
+	ready |= SELECT_WRITE;	/* Error immediately available...  */
+    }
 
   if (ready)
     *select_type = ready;