Merge pull request #2982 from bluca/formattweetnacl

Problem: formatting issues in CI

src/ip.cpp

@@ -641,9 +641,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/options.cpp

@@ -717,10 +717,10 @@ int zmq::options_t::setsockopt (int option_,
             break;
     }
 
-        // TODO mechanism should either be set explicitly, or determined when
-        // connecting. currently, it depends on the order of setsockopt calls
-        // if there is some inconsistency, which is confusing. in addition,
-        // the assumed or set mechanism should be queryable (as a socket option)
+            // TODO mechanism should either be set explicitly, or determined when
+            // connecting. currently, it depends on the order of setsockopt calls
+            // if there is some inconsistency, which is confusing. in addition,
+            // the assumed or set mechanism should be queryable (as a socket option)
 
 #if defined(ZMQ_ACT_MILITANT)
     //  There is no valid use case for passing an error back to the application

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
@@ -878,7 +878,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/socks_connecter.cpp

@@ -357,7 +357,7 @@ int zmq::socks_connecter_t::connect_to_proxy ()
         }
     }
 
-    //  Connect to the remote peer.
+        //  Connect to the remote peer.
 #if defined ZMQ_HAVE_VXWORKS
     rc = ::connect (s, (sockaddr *) tcp_addr->addr (), tcp_addr->addrlen ());
 #else

src/tcp_connecter.cpp

@@ -347,7 +347,7 @@ int zmq::tcp_connecter_t::open ()
             return -1;
     }
 
-    //  Connect to the remote peer.
+        //  Connect to the remote peer.
 #if defined ZMQ_HAVE_VXWORKS
     rc = ::connect (s, (sockaddr *) tcp_addr->addr (), tcp_addr->addrlen ());
 #else
@@ -358,8 +358,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/tweetnacl.c

@@ -32,18 +32,22 @@
 */
 #include "platform.hpp"
 
-#if defined (ZMQ_USE_TWEETNACL)
+#if defined(ZMQ_USE_TWEETNACL)
 
 /*
     Disable warnings for this source only, rather than for the whole
     codebase when building with C99 (gcc >= 4.2) or with Microsoft's compiler
 */
-#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) && __STDC_VERSION__ < 201112L
-#   pragma GCC diagnostic ignored "-Wsign-compare"
+#if defined __GNUC__                                                           \
+  && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))                  \
+  && __STDC_VERSION__ < 201112L
+#pragma GCC diagnostic ignored "-Wsign-compare"
 #elif defined _MSC_VER
-#   pragma warning (disable:4018 4244 4146)
+#pragma warning(disable : 4018 4244 4146)
 #endif
 
+// clang-format off
+
 #include "tweetnacl.h"
 
 #define FOR(i,n) for (i = 0;i < n;++i)
@@ -986,3 +990,4 @@ int sodium_init (void)
 #endif
 
 #endif
+// clang-format on

src/ypipe.hpp

@@ -62,9 +62,9 @@ template <typename T, int N> class ypipe_t : public ypipe_base_t<T>
     //  just to keep ICC and code checking tools from complaining.
     inline virtual ~ypipe_t () {}
 
-    //  Following function (write) deliberately copies uninitialised data
-    //  when used with zmq_msg. Initialising the VSM body for
-    //  non-VSM messages won't be good for performance.
+        //  Following function (write) deliberately copies uninitialised data
+        //  when used with zmq_msg. Initialising the VSM body for
+        //  non-VSM messages won't be good for performance.
 
 #ifdef ZMQ_HAVE_OPENVMS
 #pragma message save

src/ypipe_conflate.hpp

@@ -53,9 +53,9 @@ template <typename T> class ypipe_conflate_t : public ypipe_base_t<T>
     //  just to keep ICC and code checking tools from complaining.
     inline virtual ~ypipe_conflate_t () {}
 
-    //  Following function (write) deliberately copies uninitialised data
-    //  when used with zmq_msg. Initialising the VSM body for
-    //  non-VSM messages won't be good for performance.
+        //  Following function (write) deliberately copies uninitialised data
+        //  when used with zmq_msg. Initialising the VSM body for
+        //  non-VSM messages won't be good for performance.
 
 #ifdef ZMQ_HAVE_OPENVMS
 #pragma message save

src/zmq.cpp

@@ -685,7 +685,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_)