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

Problem: zmq_msg_get_routing_id () is not consistent with API

Browse Source 
We do not use 'get' for getters.

Solution: rename to zmq_msg_routing_id () for public API.
This commit is contained in:
Pieter Hintjens 2015-09-11 13:15:00 -04:00
parent 7be6ad0504
commit 87f2dff38c
7 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/zmq.h
View File

@ -228,7 +228,7 @@ ZMQ_EXPORT int zmq_msg_get (zmq_msg_t *msg, int property);
ZMQ_EXPORT int zmq_msg_set (zmq_msg_t *msg, int property, int optval); ZMQ_EXPORT int zmq_msg_set (zmq_msg_t *msg, int property, int optval);
ZMQ_EXPORT const char *zmq_msg_gets (zmq_msg_t *msg, const char *property); ZMQ_EXPORT const char *zmq_msg_gets (zmq_msg_t *msg, const char *property);
ZMQ_EXPORT int zmq_msg_set_routing_id (zmq_msg_t *msg, uint32_t routing_id); ZMQ_EXPORT int zmq_msg_set_routing_id (zmq_msg_t *msg, uint32_t routing_id);
ZMQ_EXPORT uint32_t zmq_msg_get_routing_id(zmq_msg_t *msg); ZMQ_EXPORT uint32_t zmq_msg_routing_id (zmq_msg_t *msg);
/******************************************************************************/ /******************************************************************************/

2
src/zmq.cpp
View File

@ -689,7 +689,7 @@ int zmq_msg_set_routing_id (zmq_msg_t *msg_, uint32_t routing_id_)
return ((zmq::msg_t *) msg_)->set_routing_id (routing_id_); return ((zmq::msg_t *) msg_)->set_routing_id (routing_id_);
} }
uint32_t zmq_msg_get_routing_id(zmq_msg_t *msg_) uint32_t zmq_msg_routing_id (zmq_msg_t *msg_)
{ {
return ((zmq::msg_t *) msg_)->get_routing_id (); return ((zmq::msg_t *) msg_)->get_routing_id ();
} }

6
tests/test_client_server.cpp
View File

@ -38,9 +38,7 @@ int main (void)
void *server = zmq_socket (ctx, ZMQ_SERVER); void *server = zmq_socket (ctx, ZMQ_SERVER);
void *client = zmq_socket (ctx, ZMQ_CLIENT); void *client = zmq_socket (ctx, ZMQ_CLIENT);
int rc; int rc = zmq_bind (server, "tcp://127.0.0.1:5560");
rc = zmq_bind (server, "tcp://127.0.0.1:5560");
assert (rc == 0); assert (rc == 0);
rc = zmq_connect (client, "tcp://127.0.0.1:5560"); rc = zmq_connect (client, "tcp://127.0.0.1:5560");
@ -61,7 +59,7 @@ int main (void)
rc = zmq_msg_recv (&msg, server, 0); rc = zmq_msg_recv (&msg, server, 0);
assert (rc == 1); assert (rc == 1);
uint32_t routing_id = zmq_msg_get_routing_id(&msg); uint32_t routing_id = zmq_msg_routing_id (&msg);
assert (routing_id != 0); assert (routing_id != 0);
rc = zmq_msg_close(&msg); rc = zmq_msg_close(&msg);