summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Brown <kbrown@cornell.edu>2019-06-22 11:49:44 -0400
committerKen Brown <kbrown@cornell.edu>2019-06-23 10:16:34 -0400
commitd54edfdf81b20832aff8627b31a579fb5ba0106e (patch)
tree65e8508ef88ee30fb49969921a07b6a88dc69615
parent23570916173c9f16213f1a524ddc96878b4c9d80 (diff)
downloadcygnal-d54edfdf81b20832aff8627b31a579fb5ba0106e.tar.gz
cygnal-d54edfdf81b20832aff8627b31a579fb5ba0106e.tar.bz2
cygnal-d54edfdf81b20832aff8627b31a579fb5ba0106e.zip
Cygwin: FIFO: minor cleanup
Don't use a label with the same name as a variable. Also fix indentation in fhandler.h.
-rw-r--r--winsup/cygwin/fhandler.h10
-rw-r--r--winsup/cygwin/fhandler_fifo.cc4
2 files changed, 7 insertions, 7 deletions
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 185de988a..7e59d84d0 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -1238,11 +1238,11 @@ public:
#define MAX_CLIENTS 64
enum fifo_client_connect_state
- {
- fc_unknown,
- fc_connected,
- fc_invalid
- };
+{
+ fc_unknown,
+ fc_connected,
+ fc_invalid
+};
enum
{
diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc
index e0af54b2e..edc6caeb3 100644
--- a/winsup/cygwin/fhandler_fifo.cc
+++ b/winsup/cygwin/fhandler_fifo.cc
@@ -761,7 +761,7 @@ fhandler_fifo::hit_eof ()
bool eof;
bool retry = true;
-retry:
+repeat:
fifo_client_lock ();
eof = (nconnected == 0);
fifo_client_unlock ();
@@ -770,7 +770,7 @@ retry:
retry = false;
/* Give the listen_client thread time to catch up. */
Sleep (1);
- goto retry;
+ goto repeat;
}
return eof;
}