don't need to rename zmq_recv

we don't support libzmq 2, so this is unnecessary

Author: minrk

zmq/backend/cffi/_cdefs.h

@@ -46,7 +46,7 @@ int zmq_msg_close(zmq_msg_t *msg);
 int zmq_msg_copy(zmq_msg_t *dst, zmq_msg_t *src);
 int zmq_msg_send(zmq_msg_t *msg, void *socket, int flags);
 int zmq_msg_recv(zmq_msg_t *msg, void *socket, int flags);
-int zmq_recvbuf(void *socket, void *buf, int nbytes, int flags);
+int zmq_recv(void *socket, void *buf, int nbytes, int flags);
 
 int zmq_getsockopt(void *socket,
                    int option_name,

zmq/backend/cffi/socket.py

@@ -351,7 +351,7 @@ def recv_into(self, buffer, /, *, nbytes: int = 0, flags: int = 0) -> int:
         elif nbytes > view_bytes:
             raise ValueError(f"{nbytes=} too big for memoryview of {view_bytes}B")
         c_buf = ffi.from_buffer(view)
-        rc: int = _retry_sys_call(C.zmq_recvbuf, self._zmq_socket, c_buf, nbytes, flags)
+        rc: int = _retry_sys_call(C.zmq_recv, self._zmq_socket, c_buf, nbytes, flags)
         _check_rc(rc)
         return rc
 

zmq/backend/cython/_zmq.py

@@ -132,7 +132,7 @@
     zmq_pollitem_t,
     zmq_proxy,
     zmq_proxy_steerable,
-    zmq_recvbuf,
+    zmq_recv,
     zmq_setsockopt,
     zmq_socket,
     zmq_socket_monitor,
@@ -1258,7 +1258,7 @@ def recv_into(self, buffer, /, *, nbytes=0, flags=0) -> C.int:
         # call zmq_recv, with retries
         while True:
             with nogil:
-                rc: C.int = zmq_recvbuf(self.handle, py_buf.buf, c_nbytes, c_flags)
+                rc: C.int = zmq_recv(self.handle, py_buf.buf, c_nbytes, c_flags)
             try:
                 _check_rc(rc)
             except InterruptedSystemCall:

zmq/backend/cython/libzmq.pxd

@@ -78,7 +78,6 @@ cdef extern from "zmq.h" nogil:
     int zmq_msg_set (zmq_msg_t *msg, int option, int optval)
     const char *zmq_msg_gets (zmq_msg_t *msg, const char *property)
     int zmq_has (const char *capability)
-    int zmq_recvbuf(void *s_, void *buf_, size_t len_, int flags_)
 
     void *zmq_socket (void *context, int type)
     int zmq_close (void *s)
@@ -92,8 +91,8 @@ cdef extern from "zmq.h" nogil:
     int zmq_socket_monitor (void *s, char *addr, int flags)
 
     # send/recv
-    int zmq_sendbuf (void *s, const void *buf, size_t n, int flags)
-    int zmq_recvbuf (void *s, void *buf, size_t n, int flags)
+    int zmq_send (void *s, const void *buf, size_t n, int flags)
+    int zmq_recv (void *s, void *buf, size_t n, int flags)
 
     ctypedef struct zmq_pollitem_t:
         void *socket

zmq/utils/zmq_compat.h

@@ -78,35 +78,8 @@
     #define zmq_proxy_steerable(in, out, mon, ctrl) _missing
 #endif
 
-#if ZMQ_VERSION_MAJOR >= 3
-    #define zmq_sendbuf zmq_send
-    #define zmq_recvbuf zmq_recv
-
-    // 3.x deprecations - these symbols haven't been removed,
-    // but let's protect against their planned removal
-    #define zmq_device(device_type, isocket, osocket) _missing
-    #define zmq_init(io_threads) ((void*)NULL)
-    #define zmq_term zmq_ctx_destroy
-#else
-    #define zmq_ctx_set(ctx, opt, val) _missing
-    #define zmq_ctx_get(ctx, opt) _missing
-    #define zmq_ctx_destroy zmq_term
-    #define zmq_ctx_new() ((void*)NULL)
-
-    #define zmq_proxy(a,b,c) _missing
-
-    #define zmq_disconnect(s, addr) _missing
-    #define zmq_unbind(s, addr) _missing
-
-    #define zmq_msg_more(msg) _missing
-    #define zmq_msg_get(msg, opt) _missing
-    #define zmq_msg_set(msg, opt, val) _missing
-    #define zmq_msg_send(msg, s, flags) zmq_send(s, msg, flags)
-    #define zmq_msg_recv(msg, s, flags) zmq_recv(s, msg, flags)
-
-    #define zmq_sendbuf(s, buf, len, flags) _missing
-    #define zmq_recvbuf(s, buf, len, flags) _missing
-
-    #define zmq_socket_monitor(s, addr, flags) _missing
-
-#endif
+// 3.x deprecations - these symbols haven't been removed,
+// but let's protect against their planned removal
+#define zmq_device(device_type, isocket, osocket) _missing
+#define zmq_init(io_threads) ((void*)NULL)
+#define zmq_term zmq_ctx_destroy