generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-28 03:20:13 +01:00
Code Issues Projects Releases Wiki Activity

ZMQ_RATE and ZMQ_RECOVERY_IVL types cahnged to int

Browse Source 
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Martin Sustrik
2011-03-24 15:18:20 +01:00
parent d61f067f5b
commit bd9d7715eb
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/options.cpp
View File

@@ -79,19 +79,19 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
return 0;
case ZMQ_RATE:
if (optvallen_ != sizeof (int64_t) || *((int64_t*) optval_) <= 0) {
if (optvallen_ != sizeof (int) || *((int*) optval_) <= 0) {
errno = EINVAL;
return -1;
}
rate = (uint32_t) *((int64_t*) optval_);
rate = *((int*) optval_);
return 0;
case ZMQ_RECOVERY_IVL:
if (optvallen_ != sizeof (int64_t) || *((int64_t*) optval_) < 0) {
if (optvallen_ != sizeof (int) || *((int*) optval_) < 0) {
errno = EINVAL;
return -1;
}
recovery_ivl = (uint32_t) *((int64_t*) optval_);
recovery_ivl = *((int*) optval_);
return 0;
case ZMQ_SNDBUF:
@@ -195,23 +195,22 @@ int zmq::options_t::getsockopt (int option_, void *optval_, size_t *optvallen_)
*optvallen_ = identity.size ();
return 0;
case ZMQ_RATE:
if (*optvallen_ < sizeof (int64_t)) {
if (*optvallen_ < sizeof (int)) {
errno = EINVAL;
return -1;
}
*((int64_t*) optval_) = rate;
*optvallen_ = sizeof (int64_t);
*((int*) optval_) = rate;
*optvallen_ = sizeof (int);
return 0;
case ZMQ_RECOVERY_IVL:
if (*optvallen_ < sizeof (int64_t)) {
if (*optvallen_ < sizeof (int)) {
errno = EINVAL;
return -1;
}
*((int64_t*) optval_) = recovery_ivl;
*optvallen_ = sizeof (int64_t);
*((int*) optval_) = recovery_ivl;
*optvallen_ = sizeof (int);
return 0;
case ZMQ_SNDBUF: