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_HWM type changed to int

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

8
src/options.cpp
View File

@@ -50,11 +50,11 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
switch (option_) {
case ZMQ_HWM:
if (optvallen_ != sizeof (uint64_t)) {
if (optvallen_ != sizeof (int) || *((int*) optval_) < 0) {
errno = EINVAL;
return -1;
}
hwm = *((uint64_t*) optval_);
hwm = *((int*) optval_);
return 0;
case ZMQ_AFFINITY:
@@ -169,11 +169,11 @@ int zmq::options_t::getsockopt (int option_, void *optval_, size_t *optvallen_)
switch (option_) {
case ZMQ_HWM:
if (*optvallen_ < sizeof (uint64_t)) {
if (*optvallen_ < sizeof (int)) {
errno = EINVAL;
return -1;
}
*((uint64_t*) optval_) = hwm;
*((int*) optval_) = hwm;
*optvallen_ = sizeof (uint64_t);
return 0;