From 8d544ef1c4861478d022ba3dbd2299232fd1e2a4 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 10 Mar 2018 12:44:27 +0000 Subject: [PATCH] Problem: formatting issues in the CI Solution: commit clang-format-diff --- src/ip.cpp | 6 +++--- src/options.cpp | 8 ++++---- src/socket_base.cpp | 8 ++++---- src/socks_connecter.cpp | 2 +- src/tcp_connecter.cpp | 6 +++--- src/tweetnacl.c | 10 ++++++---- src/ypipe.hpp | 6 +++--- src/ypipe_conflate.hpp | 6 +++--- src/zmq.cpp | 2 +- 9 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/ip.cpp b/src/ip.cpp index f47852df..abc49858 100644 --- a/src/ip.cpp +++ b/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); diff --git a/src/options.cpp b/src/options.cpp index 0f1a06de..754f6256 100644 --- a/src/options.cpp +++ b/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 diff --git a/src/socket_base.cpp b/src/socket_base.cpp index 17531e0f..70fef8b1 100644 --- a/src/socket_base.cpp +++ b/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") { diff --git a/src/socks_connecter.cpp b/src/socks_connecter.cpp index c16bd91e..91a28cd0 100644 --- a/src/socks_connecter.cpp +++ b/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 diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp index 65b8226d..7d9d3a79 100644 --- a/src/tcp_connecter.cpp +++ b/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) diff --git a/src/tweetnacl.c b/src/tweetnacl.c index 8f3b8aa3..fe1b017d 100644 --- a/src/tweetnacl.c +++ b/src/tweetnacl.c @@ -32,16 +32,18 @@ */ #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 diff --git a/src/ypipe.hpp b/src/ypipe.hpp index 935bf183..146bd6d0 100644 --- a/src/ypipe.hpp +++ b/src/ypipe.hpp @@ -62,9 +62,9 @@ template class ypipe_t : public ypipe_base_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 diff --git a/src/ypipe_conflate.hpp b/src/ypipe_conflate.hpp index dd9d22aa..88cd5064 100644 --- a/src/ypipe_conflate.hpp +++ b/src/ypipe_conflate.hpp @@ -53,9 +53,9 @@ template class ypipe_conflate_t : public ypipe_base_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 diff --git a/src/zmq.cpp b/src/zmq.cpp index 864139da..832eb772 100644 --- a/src/zmq.cpp +++ b/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_)