Skip to content

Commit 501a88b

Browse files
remijouannetremijouannet
committed
clang-format
1 parent 54f83a6 commit 501a88b

12 files changed

+46
-38
lines changed

‎src/atomic_counter.hpp‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,15 @@ class atomic_counter_t
6464
public:
6565
typedef uint32_t integer_t;
6666

67-
atomic_counter_t (integer_t value_ = 0) ZMQ_NOEXCEPT : _value (value_) {}
67+
atomic_counter_t (integer_t value_ = 0) ZMQ_NOEXCEPT : _value (value_)
68+
{
69+
}
6870

6971
// Set counter _value (not thread-safe).
70-
void set (integer_t value_) ZMQ_NOEXCEPT { _value = value_; }
72+
void set (integer_t value_) ZMQ_NOEXCEPT
73+
{
74+
_value = value_;
75+
}
7176

7277
// Atomic addition. Returns the old _value.
7378
integer_t add (integer_t increment_) ZMQ_NOEXCEPT
@@ -170,7 +175,10 @@ class atomic_counter_t
170175
#endif
171176
}
172177

173-
integer_t get () const ZMQ_NOEXCEPT { return _value; }
178+
integer_t get () const ZMQ_NOEXCEPT
179+
{
180+
return _value;
181+
}
174182

175183
private:
176184
#if defined ZMQ_ATOMIC_COUNTER_CXX11

‎src/ip_resolver.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class ip_resolver_t
6363
{
6464
public:
6565
ip_resolver_t (ip_resolver_options_t opts_);
66-
virtual ~ip_resolver_t (){};
66+
virtual ~ip_resolver_t () {};
6767

6868
int resolve (ip_addr_t *ip_addr_, const char *name_);
6969

‎src/ipc_connecter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ int zmq::ipc_connecter_t::open ()
109109
if (rc == 0)
110110
return 0;
111111

112-
// Translate other error codes indicating asynchronous connect has been
113-
// launched to a uniform EINPROGRESS.
112+
// Translate other error codes indicating asynchronous connect has been
113+
// launched to a uniform EINPROGRESS.
114114
#ifdef ZMQ_HAVE_WINDOWS
115115
const int last_error = WSAGetLastError ();
116116
if (last_error == WSAEINPROGRESS || last_error == WSAEWOULDBLOCK)

‎src/socks_connecter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,8 @@ int zmq::socks_connecter_t::connect_to_proxy ()
300300
if (rc == 0)
301301
return 0;
302302

303-
// Translate error codes indicating asynchronous connect has been
304-
// launched to a uniform EINPROGRESS.
303+
// Translate error codes indicating asynchronous connect has been
304+
// launched to a uniform EINPROGRESS.
305305
#ifdef ZMQ_HAVE_WINDOWS
306306
const int last_error = WSAGetLastError ();
307307
if (last_error == WSAEINPROGRESS || last_error == WSAEWOULDBLOCK)

‎src/thread.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ void zmq::thread_t::
136136

137137
#else
138138

139-
// not implemented
139+
// not implemented
140140

141141
#endif
142142
}
@@ -359,7 +359,7 @@ void zmq::thread_t::
359359
if (!_name[0])
360360
return;
361361

362-
/* Fails with permission denied on Android 5/6 */
362+
/* Fails with permission denied on Android 5/6 */
363363
#if defined(ZMQ_HAVE_ANDROID)
364364
return;
365365
#endif

‎src/vsock_address.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ zmq::vsock_address_t::vsock_address_t (ctx_t *parent_) : parent (parent_)
2424
}
2525

2626
zmq::vsock_address_t::vsock_address_t (const sockaddr *sa,
27-
socklen_t sa_len,
28-
ctx_t *parent_) :
27+
socklen_t sa_len,
28+
ctx_t *parent_) :
2929
parent (parent_)
3030
{
3131
zmq_assert (sa && sa_len > 0);
@@ -92,8 +92,7 @@ int zmq::vsock_address_t::resolve (const char *path_)
9292
port = static_cast<unsigned int> (l);
9393
}
9494

95-
address.svm_family =
96-
static_cast<sa_family_t> (AF_VSOCK);
95+
address.svm_family = static_cast<sa_family_t> (AF_VSOCK);
9796
address.svm_cid = cid;
9897
address.svm_port = port;
9998

‎src/vsock_connecter.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
#include "linux/vm_sockets.h"
2121

2222
zmq::vsock_connecter_t::vsock_connecter_t (class io_thread_t *io_thread_,
23-
class session_base_t *session_,
24-
const options_t &options_,
25-
address_t *addr_,
26-
bool delayed_start_) :
23+
class session_base_t *session_,
24+
const options_t &options_,
25+
address_t *addr_,
26+
bool delayed_start_) :
2727
stream_connecter_base_t (
2828
io_thread_, session_, options_, addr_, delayed_start_),
2929
_connect_timer_started (false)
@@ -90,7 +90,7 @@ void zmq::vsock_connecter_t::out_event ()
9090

9191
std::string
9292
zmq::vsock_connecter_t::get_socket_name (zmq::fd_t fd_,
93-
socket_end_t socket_end_) const
93+
socket_end_t socket_end_) const
9494
{
9595
struct sockaddr_storage ss;
9696
const zmq_socklen_t sl = get_socket_address (fd_, socket_end_, &ss);
@@ -99,7 +99,7 @@ zmq::vsock_connecter_t::get_socket_name (zmq::fd_t fd_,
9999
}
100100

101101
const vsock_address_t addr (reinterpret_cast<struct sockaddr *> (&ss), sl,
102-
this->get_ctx ());
102+
this->get_ctx ());
103103
std::string address_string;
104104
addr.to_string (address_string);
105105
return address_string;

‎src/vsock_connecter.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ class vsock_connecter_t ZMQ_FINAL : public stream_connecter_base_t
2424
// If 'delayed_start' is true connecter first waits for a while,
2525
// then starts connection process.
2626
vsock_connecter_t (zmq::io_thread_t *io_thread_,
27-
zmq::session_base_t *session_,
28-
const options_t &options_,
29-
address_t *addr_,
30-
bool delayed_start_);
27+
zmq::session_base_t *session_,
28+
const options_t &options_,
29+
address_t *addr_,
30+
bool delayed_start_);
3131
~vsock_connecter_t ();
3232

3333
protected:

‎src/vsock_listener.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include <fcntl.h>
2323

2424
zmq::vsock_listener_t::vsock_listener_t (io_thread_t *io_thread_,
25-
socket_base_t *socket_,
26-
const options_t &options_) :
25+
socket_base_t *socket_,
26+
const options_t &options_) :
2727
stream_listener_base_t (io_thread_, socket_, options_)
2828
{
2929
}
@@ -45,7 +45,7 @@ void zmq::vsock_listener_t::in_event ()
4545

4646
std::string
4747
zmq::vsock_listener_t::get_socket_name (zmq::fd_t fd_,
48-
socket_end_t socket_end_) const
48+
socket_end_t socket_end_) const
4949
{
5050
struct sockaddr_storage ss;
5151
const zmq_socklen_t sl = get_socket_address (fd_, socket_end_, &ss);
@@ -54,7 +54,7 @@ zmq::vsock_listener_t::get_socket_name (zmq::fd_t fd_,
5454
}
5555

5656
const vsock_address_t addr (reinterpret_cast<struct sockaddr *> (&ss), sl,
57-
this->get_ctx ());
57+
this->get_ctx ());
5858
std::string address_string;
5959
addr.to_string (address_string);
6060
return address_string;

‎src/vsock_listener.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class vsock_listener_t ZMQ_FINAL : public stream_listener_base_t
1919
{
2020
public:
2121
vsock_listener_t (zmq::io_thread_t *io_thread_,
22-
zmq::socket_base_t *socket_,
23-
const options_t &options_);
22+
zmq::socket_base_t *socket_,
23+
const options_t &options_);
2424

2525
// Set address to listen on.
2626
int set_local_address (const char *addr_);

0 commit comments

Comments
 (0)