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

Merge pull request #1048 from hurtonm/master

Browse Source 
PLAIN: Small simplification
This commit is contained in:
Pieter Hintjens 2014-05-19 21:04:40 +02:00
commit a1fbd97330
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plain_client.cpp
View File

@ -30,7 +30,6 @@
zmq::plain_client_t::plain_client_t (const options_t &options_) : zmq::plain_client_t::plain_client_t (const options_t &options_) :
mechanism_t (options_), mechanism_t (options_),
error_command_received (false),
state (sending_hello) state (sending_hello)
{ {
} }
@ -98,7 +97,7 @@ zmq::mechanism_t::status_t zmq::plain_client_t::status () const
if (state == ready) if (state == ready)
return mechanism_t::ready; return mechanism_t::ready;
else else
if (error_command_received) if (state == error_command_received)
return mechanism_t::error; return mechanism_t::error;
else else
return mechanism_t::handshaking; return mechanism_t::handshaking;
@ -208,6 +207,6 @@ int zmq::plain_client_t::process_error (
errno = EPROTO; errno = EPROTO;
return -1; return -1;
} }
error_command_received = true; state = error_command_received;
return 0; return 0;
} }

3
src/plain_client.hpp
View File

@ -42,13 +42,12 @@ namespace zmq
private: private:
bool error_command_received;
enum state_t { enum state_t {
sending_hello, sending_hello,
waiting_for_welcome, waiting_for_welcome,
sending_initiate, sending_initiate,
waiting_for_ready, waiting_for_ready,
error_command_received,
ready ready
}; };