Merge pull request #2970 from bluca/format

Problem: CI check for format fails

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,6 +9,14 @@ Problem: X is broken
 Solution: do Y and Z to fix X
 ```
 
+Please try to have the code changes conform to our coding style. For your
+convenience, you can install clang-format (at least version 5.0) and then
+run ```make clang-format-check```. Don't fix existing issues, if any - just
+make sure your changes are compliant. ```make clang-format-diff``` will
+automatically apply the required changes.
+To set a specific clang-format binary with autotools, you can for example
+run: ```./configure CLANG_FORMAT=clang-format-5.0```
+
 Please avoid sending a pull request with recursive merge nodes, as they
 are impossible to fix once merged. Please rebase your branch on
 zeromq/libzmq master instead of merging it.

src/generic_mtrie_impl.hpp

@@ -167,7 +167,7 @@ void zmq::generic_mtrie_t<T>::rm (value_t *pipe_,
 
 template <typename T>
 template <typename Arg>
-void zmq::generic_mtrie_t<T>::rm_helper(value_t *pipe_,
+void zmq::generic_mtrie_t<T>::rm_helper (value_t *pipe_,
                                          unsigned char **buff_,
                                          size_t buffsize_,
                                          size_t maxbuffsize_,

src/ip.cpp

@@ -594,9 +594,9 @@ int zmq::make_fdpair (fd_t *r_, fd_t *w_)
         *w_ = *r_ = -1;
         return -1;
     } else {
-        //  If there's no SOCK_CLOEXEC, let's try the second best option. Note that
-        //  race condition can cause socket not to be closed (if fork happens
-        //  between socket creation and this point).
+    //  If there's no SOCK_CLOEXEC, let's try the second best option. Note that
+    //  race condition can cause socket not to be closed (if fork happens
+    //  between socket creation and this point).
 #if !defined ZMQ_HAVE_SOCK_CLOEXEC && defined FD_CLOEXEC
         rc = fcntl (sv[0], F_SETFD, FD_CLOEXEC);
         errno_assert (rc != -1);

src/socket_base.cpp

@@ -313,9 +313,9 @@ int zmq::socket_base_t::check_protocol (const std::string &protocol_)
         return -1;
     }
 
-    //  Check whether socket type and transport protocol match.
-    //  Specifically, multicast protocols can't be combined with
-    //  bi-directional messaging patterns (socket types).
+        //  Check whether socket type and transport protocol match.
+        //  Specifically, multicast protocols can't be combined with
+        //  bi-directional messaging patterns (socket types).
 #if defined ZMQ_HAVE_OPENPGM || defined ZMQ_HAVE_NORM
     if ((protocol_ == "pgm" || protocol_ == "epgm" || protocol_ == "norm")
         && options.type != ZMQ_PUB && options.type != ZMQ_SUB
@@ -912,7 +912,7 @@ int zmq::socket_base_t::connect (const char *addr_)
         }
     }
 
-    // TBD - Should we check address for ZMQ_HAVE_NORM???
+        // TBD - Should we check address for ZMQ_HAVE_NORM???
 
 #ifdef ZMQ_HAVE_OPENPGM
     if (protocol == "pgm" || protocol == "epgm") {

src/tcp_connecter.cpp

@@ -343,8 +343,8 @@ int zmq::tcp_connecter_t::open ()
         return 0;
     }
 
-    //  Translate error codes indicating asynchronous connect has been
-    //  launched to a uniform EINPROGRESS.
+        //  Translate error codes indicating asynchronous connect has been
+        //  launched to a uniform EINPROGRESS.
 #ifdef ZMQ_HAVE_WINDOWS
     const int last_error = WSAGetLastError ();
     if (last_error == WSAEINPROGRESS || last_error == WSAEWOULDBLOCK)

src/zmq.cpp

@@ -682,7 +682,7 @@ const char *zmq_msg_gets (const zmq_msg_t *msg_, const char *property_)
     }
 }
 
-// Polling.
+    // Polling.
 
 #if defined ZMQ_HAVE_POLLER
 inline int zmq_poller_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)