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

Problem: magic literal used for inproc

Browse Source 
Solution: define and use named constant
This commit is contained in:
Simon Giesecke 2018-08-15 13:19:59 +02:00
parent daadb65a46
commit 799fae44fe
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/address.hpp
View File

@ -49,6 +49,7 @@ class vmci_address_t;
namespace protocol_name namespace protocol_name
{ {
static const char inproc[] = "inproc";
static const char tcp[] = "tcp"; static const char tcp[] = "tcp";
static const char udp[] = "udp"; static const char udp[] = "udp";
#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS \ #if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS \

10
src/socket_base.cpp
View File

@ -326,7 +326,7 @@ int zmq::socket_base_t::parse_uri (const char *uri_,
int zmq::socket_base_t::check_protocol (const std::string &protocol_) const int zmq::socket_base_t::check_protocol (const std::string &protocol_) const
{ {
// First check out whether the protocol is something we are aware of. // First check out whether the protocol is something we are aware of.
if (protocol_ != "inproc" if (protocol_ != protocol_name::inproc
#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS \ #if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS \
&& !defined ZMQ_HAVE_VXWORKS && !defined ZMQ_HAVE_VXWORKS
&& protocol_ != protocol_name::ipc && protocol_ != protocol_name::ipc
@ -522,7 +522,7 @@ int zmq::socket_base_t::bind (const char *endpoint_uri_)
return -1; return -1;
} }
if (protocol == "inproc") { if (protocol == protocol_name::inproc) {
const endpoint_t endpoint = {this, options}; const endpoint_t endpoint = {this, options};
rc = register_endpoint (endpoint_uri_, endpoint); rc = register_endpoint (endpoint_uri_, endpoint);
if (rc == 0) { if (rc == 0) {
@ -714,7 +714,7 @@ int zmq::socket_base_t::connect (const char *endpoint_uri_)
return -1; return -1;
} }
if (protocol == "inproc") { if (protocol == protocol_name::inproc) {
// TODO: inproc connect is specific with respect to creating pipes // TODO: inproc connect is specific with respect to creating pipes
// as there's no 'reconnect' functionality implemented. Once that // as there's no 'reconnect' functionality implemented. Once that
// is in place we should follow generic pipe creation algorithm. // is in place we should follow generic pipe creation algorithm.
@ -1045,7 +1045,7 @@ int zmq::socket_base_t::term_endpoint (const char *endpoint_uri_)
const std::string endpoint_uri_str = std::string (endpoint_uri_); const std::string endpoint_uri_str = std::string (endpoint_uri_);
// Disconnect an inproc socket // Disconnect an inproc socket
if (uri_protocol == "inproc") { if (uri_protocol == protocol_name::inproc) {
return unregister_endpoint (endpoint_uri_str, this) == 0 return unregister_endpoint (endpoint_uri_str, this) == 0
? 0 ? 0
: _inprocs.erase_pipes (endpoint_uri_str); : _inprocs.erase_pipes (endpoint_uri_str);
@ -1578,7 +1578,7 @@ int zmq::socket_base_t::monitor (const char *endpoint_, int events_)
return -1; return -1;
// Event notification only supported over inproc:// // Event notification only supported over inproc://
if (protocol != "inproc") { if (protocol != protocol_name::inproc) {
errno = EPROTONOSUPPORT; errno = EPROTONOSUPPORT;
return -1; return -1;
} }