Commit f9417dab authored by Luca Boccassi's avatar Luca Boccassi

Problem: msg_t functions do not respect coding style

Solution: fix them
parent 07d36876
...@@ -221,7 +221,7 @@ int zmq::msg_t::init_leave () ...@@ -221,7 +221,7 @@ int zmq::msg_t::init_leave ()
return 0; return 0;
} }
int zmq::msg_t::init_subscribe (const size_t size_, const unsigned char *topic) int zmq::msg_t::init_subscribe (const size_t size_, const unsigned char *topic_)
{ {
int rc = init_size (size_); int rc = init_size (size_);
if (rc == 0) { if (rc == 0) {
...@@ -229,14 +229,14 @@ int zmq::msg_t::init_subscribe (const size_t size_, const unsigned char *topic) ...@@ -229,14 +229,14 @@ int zmq::msg_t::init_subscribe (const size_t size_, const unsigned char *topic)
// We explicitly allow a NULL subscription with size zero // We explicitly allow a NULL subscription with size zero
if (size_) { if (size_) {
assert (topic); assert (topic_);
memcpy (data (), topic, size_); memcpy (data (), topic_, size_);
} }
} }
return rc; return rc;
} }
int zmq::msg_t::init_cancel (const size_t size_, const unsigned char *topic) int zmq::msg_t::init_cancel (const size_t size_, const unsigned char *topic_)
{ {
int rc = init_size (size_); int rc = init_size (size_);
if (rc == 0) { if (rc == 0) {
...@@ -244,8 +244,8 @@ int zmq::msg_t::init_cancel (const size_t size_, const unsigned char *topic) ...@@ -244,8 +244,8 @@ int zmq::msg_t::init_cancel (const size_t size_, const unsigned char *topic)
// We explicitly allow a NULL subscription with size zero // We explicitly allow a NULL subscription with size zero
if (size_) { if (size_) {
assert (topic); assert (topic_);
memcpy (data (), topic, size_); memcpy (data (), topic_, size_);
} }
} }
return rc; return rc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment