3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-10 16:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Problem: assignment within complex condition

Browse Source 
Solution: restructured code, inverted condition
This commit is contained in:
Simon Giesecke 2018-05-17 17:11:11 +02:00
parent fcee4ccdfd
commit 62e48f837d
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/zmq.cpp
View File

@ -685,7 +685,7 @@ const char *zmq_msg_gets (const zmq_msg_t *msg_, const char *property_)
}
}
// Polling.
// Polling.
#if defined ZMQ_HAVE_POLLER
inline int zmq_poller_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
@ -1176,18 +1176,20 @@ void *zmq_poller_new (void)
int zmq_poller_destroy (void **poller_p_)
{
void *poller;
if (!poller_p_ || !(poller = *poller_p_)
|| !((zmq::socket_poller_t *) poller)->check_tag ()) {
errno = EFAULT;
return -1;
if (poller_p_) {
zmq::socket_poller_t *const poller =
static_cast<zmq::socket_poller_t *> (*poller_p_);
if (poller && poller->check_tag ()) {
delete poller;
*poller_p_ = NULL;
return 0;
}
}
delete ((zmq::socket_poller_t *) poller);
*poller_p_ = NULL;
return 0;
errno = EFAULT;
return -1;
}
static int check_poller (void *const poller_)
{
if (!poller_ || !((zmq::socket_poller_t *) poller_)->check_tag ()) {