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

Problem: nodrop code is ugly

Browse Source 
It's bad practice to start by testing all exceptional conditions
and then dropping through to the 'normal' condition. Apart from
being inefficient, it's deceptive to the user. Conditional code
should always try to show the natural expectation of the code,
with exceptional cases coming last.

Solution: clean up this code.
This commit is contained in:
Pieter Hintjens
2014-08-27 13:48:47 +02:00
parent 2584c3a724
commit f15146b5d2
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/xpub.cpp
View File

@@ -132,25 +132,20 @@ int zmq::xpub_t::xsend (msg_t *msg_)
subscriptions.match ((unsigned char*) msg_->data (), msg_->size (), subscriptions.match ((unsigned char*) msg_->data (), msg_->size (),
mark_as_matching, this); mark_as_matching, this);
if (lossy == false && !dist.check_hwm ()) { int rc = -1; // Assume we fail
errno = EAGAIN; if (lossy || dist.check_hwm ()) {
return -1; if (dist.send_to_matching (msg_) == 0) {
// If we are at the end of multi-part message we can mark
// all the pipes as non-matching.
if (!msg_more)
dist.unmatch ();
more = msg_more;
rc = 0; // Yay, sent successfully
}
} }
else
// Send the message to all the pipes that were marked as matching errno = EAGAIN;
// in the previous step. return rc;
int rc = dist.send_to_matching (msg_);
if (rc != 0)
return rc;
// If we are at the end of multi-part message we can mark all the pipes
// as non-matching.
if (!msg_more)
dist.unmatch ();
more = msg_more;
return 0;
} }
bool zmq::xpub_t::xhas_out () bool zmq::xpub_t::xhas_out ()