From 02b81d42ce2c3b6fabcfe1bcdc6fa8bceed9762a Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Wed, 15 Feb 2012 15:17:01 -0600 Subject: [PATCH] Changed return type of zmq_msg_size to ssize_t to allow error return --- include/zmq.h | 4 ++-- src/zmq.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/zmq.h b/include/zmq.h index 9b86786b..d6d44682 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -167,14 +167,14 @@ ZMQ_EXPORT int zmq_msg_close (zmq_msg_t *msg); ZMQ_EXPORT int zmq_msg_move (zmq_msg_t *dest, zmq_msg_t *src); ZMQ_EXPORT int zmq_msg_copy (zmq_msg_t *dest, zmq_msg_t *src); ZMQ_EXPORT void *zmq_msg_data (zmq_msg_t *msg); -ZMQ_EXPORT size_t zmq_msg_size (zmq_msg_t *msg); + +ZMQ_EXPORT ssize_t zmq_msg_size (zmq_msg_t *msg); ZMQ_EXPORT int zmq_msg_more (zmq_msg_t *msg); ZMQ_EXPORT int zmq_msg_get (zmq_msg_t *msg, int option, void *optval, size_t *optvallen); ZMQ_EXPORT int zmq_msg_set (zmq_msg_t *msg, int option, const void *optval, size_t *optvallen); - /******************************************************************************/ /* 0MQ infrastructure (a.k.a. context) initialisation & termination. */ /******************************************************************************/ diff --git a/src/zmq.cpp b/src/zmq.cpp index f60a42b8..98da24ed 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -576,7 +576,7 @@ void *zmq_msg_data (zmq_msg_t *msg_) return ((zmq::msg_t*) msg_)->data (); } -size_t zmq_msg_size (zmq_msg_t *msg_) +ssize_t zmq_msg_size (zmq_msg_t *msg_) { if (!msg_) { errno = EFAULT;