generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-25 10:09:38 +02:00
Code Issues Projects Releases Wiki Activity

Some code style improvements: removed redundant parentheses, added const, joined declaration and assignment of local variables

Browse Source
This commit is contained in:
Simon Giesecke
2018-08-09 12:22:29 +02:00
parent 89e5313114
commit 758f903db4
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/socket_base.cpp
View File

@@ -543,8 +543,6 @@ int zmq::socket_base_t::bind (const char *addr_)
session_base_t::create (io_thread, true, this, options, paddr); session_base_t::create (io_thread, true, this, options, paddr);
errno_assert (session); errno_assert (session);
pipe_t *newpipe = NULL;
// Create a bi-directional pipe. // Create a bi-directional pipe.
object_t *parents[2] = {this, session}; object_t *parents[2] = {this, session};
pipe_t *new_pipes[2] = {NULL, NULL}; pipe_t *new_pipes[2] = {NULL, NULL};
@@ -556,7 +554,7 @@ int zmq::socket_base_t::bind (const char *addr_)
// Attach local end of the pipe to the socket object. // Attach local end of the pipe to the socket object.
attach_pipe (new_pipes[0], true, true); attach_pipe (new_pipes[0], true, true);
newpipe = new_pipes[0]; pipe_t *const newpipe = new_pipes[0];
// Attach remote end of the pipe to the session object later on. // Attach remote end of the pipe to the session object later on.
session->attach_pipe (new_pipes[1]); session->attach_pipe (new_pipes[1]);
@@ -564,7 +562,7 @@ int zmq::socket_base_t::bind (const char *addr_)
// Save last endpoint URI // Save last endpoint URI
paddr->to_string (_last_endpoint); paddr->to_string (_last_endpoint);
add_endpoint (addr_, (own_t *) session, newpipe); add_endpoint (addr_, static_cast<own_t *> (session), newpipe);
return 0; return 0;
} }

21
src/stream_engine.cpp
View File

@@ -105,7 +105,7 @@ zmq::stream_engine_t::stream_engine_t (fd_t fd_,
// Put the socket into non-blocking mode. // Put the socket into non-blocking mode.
unblock_socket (_s); unblock_socket (_s);
int family = get_peer_ip_address (_s, _peer_address); const int family = get_peer_ip_address (_s, _peer_address);
if (family == 0) if (family == 0)
_peer_address.clear (); _peer_address.clear ();
#if defined ZMQ_HAVE_SO_PEERCRED #if defined ZMQ_HAVE_SO_PEERCRED
@@ -1094,20 +1094,18 @@ void zmq::stream_engine_t::timer_event (int id_)
int zmq::stream_engine_t::produce_ping_message (msg_t *msg_) int zmq::stream_engine_t::produce_ping_message (msg_t *msg_)
{ {
int rc = 0;
// 16-bit TTL + \4PING == 7 // 16-bit TTL + \4PING == 7
const size_t ping_ttl_len = msg_t::ping_cmd_name_size + 2; const size_t ping_ttl_len = msg_t::ping_cmd_name_size + 2;
zmq_assert (_mechanism != NULL); zmq_assert (_mechanism != NULL);
rc = msg_->init_size (ping_ttl_len); int rc = msg_->init_size (ping_ttl_len);
errno_assert (rc == 0); errno_assert (rc == 0);
msg_->set_flags (msg_t::command); msg_->set_flags (msg_t::command);
// Copy in the command message // Copy in the command message
memcpy (msg_->data (), "\4PING", msg_t::ping_cmd_name_size); memcpy (msg_->data (), "\4PING", msg_t::ping_cmd_name_size);
uint16_t ttl_val = htons (_options.heartbeat_ttl); uint16_t ttl_val = htons (_options.heartbeat_ttl);
memcpy ((static_cast<uint8_t *> (msg_->data ())) memcpy (static_cast<uint8_t *> (msg_->data ()) + msg_t::ping_cmd_name_size,
+ msg_t::ping_cmd_name_size,
&ttl_val, sizeof (ttl_val)); &ttl_val, sizeof (ttl_val));
rc = _mechanism->encode (msg_); rc = _mechanism->encode (msg_);
@@ -1121,10 +1119,9 @@ int zmq::stream_engine_t::produce_ping_message (msg_t *msg_)
int zmq::stream_engine_t::produce_pong_message (msg_t *msg_) int zmq::stream_engine_t::produce_pong_message (msg_t *msg_)
{ {
int rc = 0;
zmq_assert (_mechanism != NULL); zmq_assert (_mechanism != NULL);
rc = msg_->move (_pong_msg); int rc = msg_->move (_pong_msg);
errno_assert (rc == 0); errno_assert (rc == 0);
rc = _mechanism->encode (msg_); rc = _mechanism->encode (msg_);
@@ -1160,17 +1157,19 @@ int zmq::stream_engine_t::process_heartbeat_message (msg_t *msg_)
// here and store it. Truncate it if it's too long. // here and store it. Truncate it if it's too long.
// Given the engine goes straight to out_event, sequential PINGs will // Given the engine goes straight to out_event, sequential PINGs will
// not be a problem. // not be a problem.
size_t context_len = msg_->size () - ping_ttl_len > ping_max_ctx_len const size_t context_len =
msg_->size () - ping_ttl_len > ping_max_ctx_len
? ping_max_ctx_len ? ping_max_ctx_len
: msg_->size () - ping_ttl_len; : msg_->size () - ping_ttl_len;
int rc = _pong_msg.init_size (msg_t::ping_cmd_name_size + context_len); const int rc =
_pong_msg.init_size (msg_t::ping_cmd_name_size + context_len);
errno_assert (rc == 0); errno_assert (rc == 0);
_pong_msg.set_flags (msg_t::command); _pong_msg.set_flags (msg_t::command);
memcpy (_pong_msg.data (), "\4PONG", msg_t::ping_cmd_name_size); memcpy (_pong_msg.data (), "\4PONG", msg_t::ping_cmd_name_size);
if (context_len > 0) if (context_len > 0)
memcpy ((static_cast<uint8_t *> (_pong_msg.data ())) memcpy (static_cast<uint8_t *> (_pong_msg.data ())
+ msg_t::ping_cmd_name_size, + msg_t::ping_cmd_name_size,
(static_cast<uint8_t *> (msg_->data ())) + ping_ttl_len, static_cast<uint8_t *> (msg_->data ()) + ping_ttl_len,
context_len); context_len);
_next_msg = &stream_engine_t::produce_pong_message; _next_msg = &stream_engine_t::produce_pong_message;