3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-18 01:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2526 from bjovke/my_work

Browse Source 
Problem: GCC 6 build fails due to misleading indentation and visually ambiguous if/else block ordering.
This commit is contained in:
Luca Boccassi 2017-04-11 12:42:35 +01:00 committed by GitHub
commit dfde9a22cc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/proxy.cpp
View File

@ -319,7 +319,7 @@ int zmq::proxy (
if (msg.size () == 6 && memcmp (msg.data (), "RESUME", 6) == 0) { if (msg.size () == 6 && memcmp (msg.data (), "RESUME", 6) == 0) {
state = active; state = active;
poller_wait = poller_in; poller_wait = poller_in;
} else } else {
if (msg.size () == 9 && memcmp (msg.data (), "TERMINATE", 9) == 0) if (msg.size () == 9 && memcmp (msg.data (), "TERMINATE", 9) == 0)
state = terminated; state = terminated;
else { else {
@ -327,7 +327,8 @@ int zmq::proxy (
puts ("E: invalid command sent to proxy"); puts ("E: invalid command sent to proxy");
zmq_assert (false); zmq_assert (false);
} }
control_in = false; }
control_in = false;
} }
if (state == active) { if (state == active) {