generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-07 05:58:45 +01:00
Code Issues Projects Releases Wiki Activity

Problem: inconsistent naming style for private data members, conflicts with naming of local variables and member functions

Browse Source 
Solution: apply and check _lower_case naming style for private data members
This commit is contained in:
Simon Giesecke
2018-05-27 11:10:39 +02:00
parent 06cfd0d8ad
commit e3c73d9881
143 changed files with 5783 additions and 4051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/v1_decoder.cpp
View File

@@ -40,18 +40,18 @@
zmq::v1_decoder_t::v1_decoder_t (size_t bufsize_, int64_t maxmsgsize_) :
decoder_base_t<v1_decoder_t> (bufsize_),
maxmsgsize (maxmsgsize_)
_max_msg_size (maxmsgsize_)
{
int rc = in_progress.init ();
int rc = _in_progress.init ();
errno_assert (rc == 0);
// At the beginning, read one byte and go to one_byte_size_ready state.
next_step (tmpbuf, 1, &v1_decoder_t::one_byte_size_ready);
next_step (_tmpbuf, 1, &v1_decoder_t::one_byte_size_ready);
}
zmq::v1_decoder_t::~v1_decoder_t ()
{
int rc = in_progress.close ();
int rc = _in_progress.close ();
errno_assert (rc == 0);
}
@@ -60,33 +60,33 @@ int zmq::v1_decoder_t::one_byte_size_ready (unsigned char const *)
// First byte of size is read. If it is 0xff read 8-byte size.
// Otherwise allocate the buffer for message data and read the
// message data into it.
if (*tmpbuf == 0xff)
next_step (tmpbuf, 8, &v1_decoder_t::eight_byte_size_ready);
if (*_tmpbuf == 0xff)
next_step (_tmpbuf, 8, &v1_decoder_t::eight_byte_size_ready);
else {
// There has to be at least one byte (the flags) in the message).
if (!*tmpbuf) {
if (!*_tmpbuf) {
errno = EPROTO;
return -1;
}
if (maxmsgsize >= 0
&& static_cast<int64_t> (*tmpbuf - 1) > maxmsgsize) {
if (_max_msg_size >= 0
&& static_cast<int64_t> (*_tmpbuf - 1) > _max_msg_size) {
errno = EMSGSIZE;
return -1;
}
int rc = in_progress.close ();
int rc = _in_progress.close ();
assert (rc == 0);
rc = in_progress.init_size (*tmpbuf - 1);
rc = _in_progress.init_size (*_tmpbuf - 1);
if (rc != 0) {
errno_assert (errno == ENOMEM);
rc = in_progress.init ();
rc = _in_progress.init ();
errno_assert (rc == 0);
errno = ENOMEM;
return -1;
}
next_step (tmpbuf, 1, &v1_decoder_t::flags_ready);
next_step (_tmpbuf, 1, &v1_decoder_t::flags_ready);
}
return 0;
}
@@ -95,7 +95,7 @@ int zmq::v1_decoder_t::eight_byte_size_ready (unsigned char const *)
{
// 8-byte payload length is read. Allocate the buffer
// for message body and read the message data into it.
const uint64_t payload_length = get_uint64 (tmpbuf);
const uint64_t payload_length = get_uint64 (_tmpbuf);
// There has to be at least one byte (the flags) in the message).
if (payload_length == 0) {
@@ -104,8 +104,8 @@ int zmq::v1_decoder_t::eight_byte_size_ready (unsigned char const *)
}
// Message size must not exceed the maximum allowed size.
if (maxmsgsize >= 0
&& payload_length - 1 > static_cast<uint64_t> (maxmsgsize)) {
if (_max_msg_size >= 0
&& payload_length - 1 > static_cast<uint64_t> (_max_msg_size)) {
errno = EMSGSIZE;
return -1;
}
@@ -118,27 +118,27 @@ int zmq::v1_decoder_t::eight_byte_size_ready (unsigned char const *)
const size_t msg_size = static_cast<size_t> (payload_length - 1);
int rc = in_progress.close ();
int rc = _in_progress.close ();
assert (rc == 0);
rc = in_progress.init_size (msg_size);
rc = _in_progress.init_size (msg_size);
if (rc != 0) {
errno_assert (errno == ENOMEM);
rc = in_progress.init ();
rc = _in_progress.init ();
errno_assert (rc == 0);
errno = ENOMEM;
return -1;
}
next_step (tmpbuf, 1, &v1_decoder_t::flags_ready);
next_step (_tmpbuf, 1, &v1_decoder_t::flags_ready);
return 0;
}
int zmq::v1_decoder_t::flags_ready (unsigned char const *)
{
// Store the flags from the wire into the message structure.
in_progress.set_flags (tmpbuf[0] & msg_t::more);
_in_progress.set_flags (_tmpbuf[0] & msg_t::more);
next_step (in_progress.data (), in_progress.size (),
next_step (_in_progress.data (), _in_progress.size (),
&v1_decoder_t::message_ready);
return 0;
@@ -148,6 +148,6 @@ int zmq::v1_decoder_t::message_ready (unsigned char const *)
{
// Message is completely read. Push it further and start reading
// new message. (in_progress is a 0-byte message after this point.)
next_step (tmpbuf, 1, &v1_decoder_t::one_byte_size_ready);
next_step (_tmpbuf, 1, &v1_decoder_t::one_byte_size_ready);
return 1;
}