Skip to content

Commit 5a77130

Browse files
committed
sendmsg => send, recvmsg => recv.
Our send and receive functions map closer to zmq 3.1's send and recv functions, so we should name ours appropriately.
1 parent 8245163 commit 5a77130

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ fn main() {
4747
err(e) { fail zmq::error_to_str(e) }
4848
};
4949

50-
alt socket.sendmsg(str::bytes("foo"), 0i32) {
50+
alt socket.send(str::bytes("foo"), 0i32) {
5151
ok(()) { }
5252
err(e) { fail zmq::error_to_str(e); }
5353
}
5454

55-
alt socket.recvmsg(0i32) {
55+
alt socket.recv(0i32) {
5656
ok(d) { log_err str::unsafe_from_bytes(d); }
5757
err(e) { fail zmq::error_to_str(e); }
5858
}

zmq.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ type socket = obj {
262262
fn bind(endpoint: str) -> result::t<(), error>;
263263
fn connect(endpoint: str) -> result::t<(), error>;
264264

265-
fn sendmsg(data: [u8], flags: c_int) -> result::t<(), error>;
266-
fn recvmsg(flags: c_int) -> result::t<[u8], error>;
265+
fn send(data: [u8], flags: c_int) -> result::t<(), error>;
266+
fn recv(flags: c_int) -> result::t<[u8], error>;
267267

268268
fn close() -> result::t<(), error>;
269269
};
@@ -362,7 +362,7 @@ obj new_socket(sock: @socket_res) {
362362
_connect(sock, endpoint)
363363
}
364364

365-
fn sendmsg(data: [u8], flags: c_int) -> result::t<(), error> {
365+
fn send(data: [u8], flags: c_int) -> result::t<(), error> {
366366
let size = vec::len(data);
367367
let msg = libzmq::rustzmq_msg_create();
368368

@@ -383,7 +383,7 @@ obj new_socket(sock: @socket_res) {
383383
if rc == -1i32 { err(errno_to_error()) } else { ok(()) }
384384
}
385385

386-
fn recvmsg(flags: c_int) -> result::t<[u8], error> unsafe {
386+
fn recv(flags: c_int) -> result::t<[u8], error> unsafe {
387387
let msg = libzmq::rustzmq_msg_create();
388388

389389
libzmq::zmq_msg_init(msg);

0 commit comments

Comments
 (0)