Problem: formatting inconsistent

Solution: applied clang-format
This commit is contained in:
sigiesec
2018-02-01 11:46:09 +01:00
parent 6d8baea714
commit 41f459e1dc
331 changed files with 13208 additions and 13691 deletions

View File

@@ -39,8 +39,8 @@
#include "err.hpp"
zmq::v2_decoder_t::v2_decoder_t (size_t bufsize_, int64_t maxmsgsize_) :
shared_message_memory_allocator( bufsize_),
decoder_base_t <v2_decoder_t, shared_message_memory_allocator> (this),
shared_message_memory_allocator (bufsize_),
decoder_base_t<v2_decoder_t, shared_message_memory_allocator> (this),
msg_flags (0),
maxmsgsize (maxmsgsize_)
{
@@ -57,17 +57,17 @@ zmq::v2_decoder_t::~v2_decoder_t ()
errno_assert (rc == 0);
}
int zmq::v2_decoder_t::flags_ready (unsigned char const*)
int zmq::v2_decoder_t::flags_ready (unsigned char const *)
{
msg_flags = 0;
if (tmpbuf [0] & v2_protocol_t::more_flag)
if (tmpbuf[0] & v2_protocol_t::more_flag)
msg_flags |= msg_t::more;
if (tmpbuf [0] & v2_protocol_t::command_flag)
if (tmpbuf[0] & v2_protocol_t::command_flag)
msg_flags |= msg_t::command;
// The payload length is either one or eight bytes,
// depending on whether the 'large' bit is set.
if (tmpbuf [0] & v2_protocol_t::large_flag)
if (tmpbuf[0] & v2_protocol_t::large_flag)
next_step (tmpbuf, 8, &v2_decoder_t::eight_byte_size_ready);
else
next_step (tmpbuf, 1, &v2_decoder_t::one_byte_size_ready);
@@ -75,59 +75,60 @@ int zmq::v2_decoder_t::flags_ready (unsigned char const*)
return 0;
}
int zmq::v2_decoder_t::one_byte_size_ready (unsigned char const* read_from)
int zmq::v2_decoder_t::one_byte_size_ready (unsigned char const *read_from)
{
return size_ready(tmpbuf[0], read_from);
return size_ready (tmpbuf[0], read_from);
}
int zmq::v2_decoder_t::eight_byte_size_ready (unsigned char const* read_from) {
int zmq::v2_decoder_t::eight_byte_size_ready (unsigned char const *read_from)
{
// The payload size is encoded as 64-bit unsigned integer.
// The most significant byte comes first.
const uint64_t msg_size = get_uint64(tmpbuf);
const uint64_t msg_size = get_uint64 (tmpbuf);
return size_ready(msg_size, read_from);
return size_ready (msg_size, read_from);
}
int zmq::v2_decoder_t::size_ready(uint64_t msg_size, unsigned char const* read_pos) {
int zmq::v2_decoder_t::size_ready (uint64_t msg_size,
unsigned char const *read_pos)
{
// Message size must not exceed the maximum allowed size.
if (maxmsgsize >= 0)
if (unlikely (msg_size > static_cast <uint64_t> (maxmsgsize))) {
if (unlikely (msg_size > static_cast<uint64_t> (maxmsgsize))) {
errno = EMSGSIZE;
return -1;
}
// Message size must fit into size_t data type.
if (unlikely (msg_size != static_cast <size_t> (msg_size))) {
if (unlikely (msg_size != static_cast<size_t> (msg_size))) {
errno = EMSGSIZE;
return -1;
}
int rc = in_progress.close();
assert(rc == 0);
int rc = in_progress.close ();
assert (rc == 0);
// the current message can exceed the current buffer. We have to copy the buffer
// data into a new message and complete it in the next receive.
if (unlikely ((unsigned char*)read_pos + msg_size > (data() + size())))
{
if (unlikely ((unsigned char *) read_pos + msg_size
> (data () + size ()))) {
// a new message has started, but the size would exceed the pre-allocated arena
// this happens every time when a message does not fit completely into the buffer
rc = in_progress.init_size (static_cast <size_t> (msg_size));
}
else
{
rc = in_progress.init_size (static_cast<size_t> (msg_size));
} else {
// construct message using n bytes from the buffer as storage
// increase buffer ref count
// if the message will be a large message, pass a valid refcnt memory location as well
rc = in_progress.init ((unsigned char *) read_pos, static_cast <size_t> (msg_size),
shared_message_memory_allocator::call_dec_ref, buffer(),
provide_content ());
rc = in_progress.init ((unsigned char *) read_pos,
static_cast<size_t> (msg_size),
shared_message_memory_allocator::call_dec_ref,
buffer (), provide_content ());
// For small messages, data has been copied and refcount does not have to be increased
if (in_progress.is_zcmsg())
{
advance_content();
inc_ref();
if (in_progress.is_zcmsg ()) {
advance_content ();
inc_ref ();
}
}
@@ -147,12 +148,12 @@ int zmq::v2_decoder_t::size_ready(uint64_t msg_size, unsigned char const* read_p
// to the current start address in the buffer because the message
// was constructed to use n bytes from the address passed as argument
next_step (in_progress.data (), in_progress.size (),
&v2_decoder_t::message_ready);
&v2_decoder_t::message_ready);
return 0;
}
int zmq::v2_decoder_t::message_ready (unsigned char const*)
int zmq::v2_decoder_t::message_ready (unsigned char const *)
{
// Message is completely read. Signal this to the caller
// and prepare to decode next message.