From f38c11c06399ab6493750725e70ec22df2268a96 Mon Sep 17 00:00:00 2001
From: Pieter Hintjens <ph@imatix.com>
Date: Fri, 30 Oct 2015 10:19:46 +0100
Subject: [PATCH] Whitespace fixes

---
 src/signaler.cpp | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/signaler.cpp b/src/signaler.cpp
index b298fda9..581c4b00 100644
--- a/src/signaler.cpp
+++ b/src/signaler.cpp
@@ -100,20 +100,15 @@ static int close_wait_ms (int fd_, unsigned int max_ms_ = 2000)
     unsigned int step_ms   = max_ms_ / 10;
     if (step_ms < 1)
         step_ms = 1;
-
     if (step_ms > 100)
         step_ms = 100;
 
     int rc = 0;       // do not sleep on first attempt
-
-    do
-    {
-        if (rc == -1 && errno == EAGAIN)
-        {
+    do {
+        if (rc == -1 && errno == EAGAIN) {
             sleep_ms (step_ms);
             ms_so_far += step_ms;
         }
-
         rc = close (fd_);
     } while (ms_so_far < max_ms_ && rc == -1 && errno == EAGAIN);
 
@@ -187,7 +182,7 @@ void zmq::signaler_t::send ()
     errno_assert (sz == sizeof (inc));
 #elif defined ZMQ_HAVE_WINDOWS
     unsigned char dummy = 0;
-    int nbytes = ::send (w, (char*) &dummy, sizeof (dummy), 0);
+    int nbytes = ::send (w, (char *) &dummy, sizeof (dummy), 0);
     wsa_assert (nbytes != SOCKET_ERROR);
     zmq_assert (nbytes == sizeof (dummy));
 #else
@@ -304,7 +299,7 @@ void zmq::signaler_t::recv ()
 #else
     unsigned char dummy;
 #if defined ZMQ_HAVE_WINDOWS
-    int nbytes = ::recv (r, (char*) &dummy, sizeof (dummy), 0);
+    int nbytes = ::recv (r, (char *) &dummy, sizeof (dummy), 0);
     wsa_assert (nbytes != SOCKET_ERROR);
 #else
     ssize_t nbytes = ::recv (r, &dummy, sizeof (dummy), 0);
@@ -342,7 +337,7 @@ int zmq::signaler_t::recv_failable ()
 #else
     unsigned char dummy;
 #if defined ZMQ_HAVE_WINDOWS
-    int nbytes = ::recv (r, (char*) &dummy, sizeof (dummy), 0);
+    int nbytes = ::recv (r, (char *) &dummy, sizeof (dummy), 0);
     if (nbytes == SOCKET_ERROR) {
 		const int last_error = WSAGetLastError();
 		if (last_error == WSAEWOULDBLOCK) {
@@ -466,11 +461,11 @@ int zmq::signaler_t::make_fdpair (fd_t *r_, fd_t *w_)
     //  Set SO_REUSEADDR and TCP_NODELAY on listening socket.
     BOOL so_reuseaddr = 1;
     int rc = setsockopt (listener, SOL_SOCKET, SO_REUSEADDR,
-        (char *)&so_reuseaddr, sizeof so_reuseaddr);
+        (char *) &so_reuseaddr, sizeof so_reuseaddr);
     wsa_assert (rc != SOCKET_ERROR);
     BOOL tcp_nodelay = 1;
     rc = setsockopt (listener, IPPROTO_TCP, TCP_NODELAY,
-        (char *)&tcp_nodelay, sizeof tcp_nodelay);
+        (char *) &tcp_nodelay, sizeof tcp_nodelay);
     wsa_assert (rc != SOCKET_ERROR);
 
     //  Init sockaddr to signaler port.
@@ -496,12 +491,12 @@ int zmq::signaler_t::make_fdpair (fd_t *r_, fd_t *w_)
     }
 
     //  Bind listening socket to signaler port.
-    rc = bind (listener, (const struct sockaddr*) &addr, sizeof addr);
+    rc = bind (listener, (const struct sockaddr *) &addr, sizeof addr);
 
     if (rc != SOCKET_ERROR && signaler_port == 0) {
         //  Retrieve ephemeral port number
         int addrlen = sizeof addr;
-        rc = getsockname (listener, (struct sockaddr*) &addr, &addrlen);
+        rc = getsockname (listener, (struct sockaddr *) &addr, &addrlen);
     }
 
     //  Listen for incoming connections.
@@ -510,7 +505,7 @@ int zmq::signaler_t::make_fdpair (fd_t *r_, fd_t *w_)
 
     //  Connect writer to the listener.
     if (rc != SOCKET_ERROR)
-        rc = connect (*w_, (struct sockaddr*) &addr, sizeof addr);
+        rc = connect (*w_, (struct sockaddr *) &addr, sizeof addr);
 
     //  Accept connection from writer.
     if (rc != SOCKET_ERROR)
@@ -582,12 +577,12 @@ int zmq::signaler_t::make_fdpair (fd_t *r_, fd_t *w_)
     rc = setsockopt (listener, IPPROTO_TCP, TCP_NODELACK, &on, sizeof on);
     errno_assert (rc != -1);
 
-    rc = bind (listener, (struct sockaddr*) &lcladdr, sizeof lcladdr);
+    rc = bind (listener, (struct sockaddr *) &lcladdr, sizeof lcladdr);
     errno_assert (rc != -1);
 
     socklen_t lcladdr_len = sizeof lcladdr;
 
-    rc = getsockname (listener, (struct sockaddr*) &lcladdr, &lcladdr_len);
+    rc = getsockname (listener, (struct sockaddr *) &lcladdr, &lcladdr_len);
     errno_assert (rc != -1);
 
     rc = listen (listener, 1);
@@ -602,7 +597,7 @@ int zmq::signaler_t::make_fdpair (fd_t *r_, fd_t *w_)
     rc = setsockopt (*w_, IPPROTO_TCP, TCP_NODELACK, &on, sizeof on);
     errno_assert (rc != -1);
 
-    rc = connect (*w_, (struct sockaddr*) &lcladdr, sizeof lcladdr);
+    rc = connect (*w_, (struct sockaddr *) &lcladdr, sizeof lcladdr);
     errno_assert (rc != -1);
 
     *r_ = accept (listener, NULL, NULL);