From af934f85caf5ec1e56514270c81ec57a92e106d9 Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Sun, 23 Dec 2012 17:47:32 +0100 Subject: [PATCH] Removed use of deprecated API methods --- doc/zmq_msg_get.txt | 2 +- doc/zmq_msg_more.txt | 2 +- doc/zmq_recv.txt | 2 -- doc/zmq_recvmsg.txt | 1 - doc/zmq_send.txt | 2 -- doc/zmq_sendmsg.txt | 2 -- doc/zmq_socket_monitor.txt | 6 +++--- 7 files changed, 5 insertions(+), 12 deletions(-) diff --git a/doc/zmq_msg_get.txt b/doc/zmq_msg_get.txt index d5fd9186..cfbe950f 100644 --- a/doc/zmq_msg_get.txt +++ b/doc/zmq_msg_get.txt @@ -45,7 +45,7 @@ while (true) { int rc = zmq_msg_init (&frame); assert (rc == 0); // Block until a message is available to be received from socket - rc = zmq_recvmsg (socket, &frame, 0); + rc = zmq_msg_recv (socket, &frame, 0); assert (rc != -1); if (zmq_msg_get (&frame, ZMQ_MORE)) fprintf (stderr, "more\n"); diff --git a/doc/zmq_msg_more.txt b/doc/zmq_msg_more.txt index 7836872a..53f6618e 100644 --- a/doc/zmq_msg_more.txt +++ b/doc/zmq_msg_more.txt @@ -35,7 +35,7 @@ while (true) { int rc = zmq_msg_init (&part); assert (rc == 0); // Block until a message is available to be received from socket - rc = zmq_recvmsg (socket, &part, 0); + rc = zmq_msg_recv (socket, &part, 0); assert (rc != -1); if (zmq_msg_more (&part)) fprintf (stderr, "more\n"); diff --git a/doc/zmq_recv.txt b/doc/zmq_recv.txt index 923baddf..536ba104 100644 --- a/doc/zmq_recv.txt +++ b/doc/zmq_recv.txt @@ -78,9 +78,7 @@ assert (nbytes != -1); SEE ALSO -------- -linkzmq:zmq_recvmsg[3] linkzmq:zmq_send[3] -linkzmq:zmq_sendmsg[3] linkzmq:zmq_getsockopt[3] linkzmq:zmq_socket[7] linkzmq:zmq[7] diff --git a/doc/zmq_recvmsg.txt b/doc/zmq_recvmsg.txt index 9aededda..1260946a 100644 --- a/doc/zmq_recvmsg.txt +++ b/doc/zmq_recvmsg.txt @@ -110,7 +110,6 @@ SEE ALSO -------- linkzmq:zmq_recv[3] linkzmq:zmq_send[3] -linkzmq:zmq_sendmsg[3] linkzmq:zmq_getsockopt[3] linkzmq:zmq_socket[7] linkzmq:zmq[7] diff --git a/doc/zmq_send.txt b/doc/zmq_send.txt index 9409f1f8..44bf4d3f 100644 --- a/doc/zmq_send.txt +++ b/doc/zmq_send.txt @@ -87,9 +87,7 @@ assert (rc == 2); SEE ALSO -------- -linkzmq:zmq_sendmsg[3] linkzmq:zmq_recv[3] -linkzmq:zmq_recvmsg[3] linkzmq:zmq_socket[7] linkzmq:zmq[7] diff --git a/doc/zmq_sendmsg.txt b/doc/zmq_sendmsg.txt index aacd7aec..e9b6534e 100644 --- a/doc/zmq_sendmsg.txt +++ b/doc/zmq_sendmsg.txt @@ -106,8 +106,6 @@ rc = zmq_sendmsg (socket, &part3, 0); SEE ALSO -------- linkzmq:zmq_recv[3] -linkzmq:zmq_recv[3] -linkzmq:zmq_recvmsg[3] linkzmq:zmq_socket[7] linkzmq:zmq[7] diff --git a/doc/zmq_socket_monitor.txt b/doc/zmq_socket_monitor.txt index f289c908..321ab6ee 100644 --- a/doc/zmq_socket_monitor.txt +++ b/doc/zmq_socket_monitor.txt @@ -37,7 +37,7 @@ static void *req_socket_monitor (void *ctx) while (true) { zmq_msg_t msg; zmq_msg_init (&msg); - rc = zmq_recvmsg (s, &msg, 0); + rc = zmq_msg_recv (s, &msg, 0); if (rc == -1 && zmq_errno() == ETERM) break; assert (rc != -1); memcpy (&event, zmq_msg_data (&msg), sizeof (event)); @@ -217,7 +217,7 @@ static void *rep_socket_monitor (void *ctx) while (true) { zmq_msg_t msg; zmq_msg_init (&msg); - rc = zmq_recvmsg (s, &msg, 0); + rc = zmq_msg_recv (s, &msg, 0); if (rc == -1 && zmq_errno() == ETERM) break; assert (rc != -1); memcpy (&event, zmq_msg_data (&msg), sizeof (event)); @@ -285,4 +285,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Lourens Naudé \ No newline at end of file +This 0MQ manual page was written by Lourens Naudé