Skip to content

L
libzmq
Commit a50a8aa3 authored by Pieter Hintjens's avatar Pieter Hintjens
Browse files
Options

Revert "more checks for parameters of API functions" 

This reverts commit e646ce43.
parent afe8cd50
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 88 deletions
src/zmq.cpp
View file @ a50a8aa3
......@@ -237,10 +237,6 @@ int zmq_setsockopt (void *s_, int option_, const void *optval_,
errno = ENOTSOCK;
return -1;
}
if (optvallen_ && !(optval_)) {
errno = EINVAL;
return -1;
}
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
if(s->thread_safe()) s->lock();
int result = s->setsockopt (option_, optval_, optvallen_);
......@@ -254,10 +250,6 @@ int zmq_getsockopt (void *s_, int option_, void *optval_, size_t *optvallen_)
errno = ENOTSOCK;
return -1;
}
if (optvallen_ && *optvallen_ && !(optval_)) {
errno = EINVAL;
return -1;
}
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
if(s->thread_safe()) s->lock();
int result = s->getsockopt (option_, optval_, optvallen_);
......@@ -295,14 +287,6 @@ int zmq_connect (void *s_, const char *addr_)
static int inner_sendmsg (zmq::socket_base_t *s_, zmq_msg_t *msg_, int flags_)
{
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) {
errno = ENOTSOCK;
return -1;
}
if (!msg_) {
errno = EINVAL;
return -1;
}
int sz = (int) zmq_msg_size (msg_);
int rc = s_->send ((zmq::msg_t*) msg_, flags_);
if (unlikely (rc < 0))
......@@ -316,10 +300,6 @@ int zmq_sendmsg (void *s_, zmq_msg_t *msg_, int flags_)
errno = ENOTSOCK;
return -1;
}
if (!msg_) {
errno = EINVAL;
return -1;
}
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
if(s->thread_safe()) s->lock();
int result = inner_sendmsg (s, msg_, flags_);
......@@ -333,10 +313,6 @@ int zmq_send (void *s_, const void *buf_, size_t len_, int flags_)
errno = ENOTSOCK;
return -1;
}
if (!buf_ || !len_) {
errno = EINVAL;
return -1;
}
zmq_msg_t msg;
int rc = zmq_msg_init_size (&msg, len_);
if (rc != 0)
......@@ -372,11 +348,6 @@ int zmq_sendv (void *s_, iovec *a_, size_t count_, int flags_)
errno = ENOTSOCK;
return -1;
}
if (!a_) {
errno = EINVAL;
return -1;
}
int rc = 0;
zmq_msg_t msg;
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
......@@ -408,14 +379,9 @@ int zmq_sendv (void *s_, iovec *a_, size_t count_, int flags_)
// Receiving functions.
int inner_recvmsg (void *s_, zmq_msg_t *msg_, int flags_)
static int inner_recvmsg (zmq::socket_base_t *s_, zmq_msg_t *msg_, int flags_)
{
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) {
errno = ENOTSOCK;
return -1;
}
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
int rc = s->recv ((zmq::msg_t*) msg_, flags_);
int rc = s_->recv ((zmq::msg_t*) msg_, flags_);
if (unlikely (rc < 0))
return -1;
return (int) zmq_msg_size (msg_);
......@@ -441,11 +407,6 @@ int zmq_recv (void *s_, void *buf_, size_t len_, int flags_)
errno = ENOTSOCK;
return -1;
}
if (!buf_ || !len_) {
errno = EINVAL;
return -1;
}
zmq_msg_t msg;
int rc = zmq_msg_init (&msg);
errno_assert (rc == 0);
......@@ -499,11 +460,6 @@ int zmq_recvmmsg (void *s_, iovec *a_, size_t *count_, int flags_)
errno = ENOTSOCK;
return -1;
}
if (!a_ || !count_ || (a_ && !(*count_))) {
errno = EINVAL;
return -1;
}
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
if(s->thread_safe()) s->lock();
......@@ -528,7 +484,7 @@ int zmq_recvmmsg (void *s_, iovec *a_, size_t *count_, int flags_)
nread = -1;
break;
}
++(*count_);
++*count_;
++nread;
// Cheat: acquire zmq_msg buffer.
......@@ -546,84 +502,48 @@ int zmq_recvmmsg (void *s_, iovec *a_, size_t *count_, int flags_)
int zmq_msg_init (zmq_msg_t *msg_)
{
if (!msg_) {
errno = EINVAL;
return -1;
}
return ((zmq::msg_t*) msg_)->init ();
}
int zmq_msg_init_size (zmq_msg_t *msg_, size_t size_)
{
if (!msg_ || !size_) {
errno = EINVAL;
return -1;
}
return ((zmq::msg_t*) msg_)->init_size (size_);
}
int zmq_msg_init_data (zmq_msg_t *msg_, void *data_, size_t size_,
zmq_free_fn *ffn_, void *hint_)
{
if (!msg_ || !data_ || !size_) {
errno = EINVAL;
return -1;
}
return ((zmq::msg_t*) msg_)->init_data (data_, size_, ffn_, hint_);
}
int zmq_msg_close (zmq_msg_t *msg_)
{
if (!msg_) {
errno = EINVAL;
return -1;
}
return ((zmq::msg_t*) msg_)->close ();
}
int zmq_msg_move (zmq_msg_t *dest_, zmq_msg_t *src_)
{
if (!dest_ || !src_) {
errno = EINVAL;
return -1;
}
return ((zmq::msg_t*) dest_)->move (*(zmq::msg_t*) src_);
}
int zmq_msg_copy (zmq_msg_t *dest_, zmq_msg_t *src_)
{
if (!dest_ || !src_) {
errno = EINVAL;
return -1;
}
return ((zmq::msg_t*) dest_)->copy (*(zmq::msg_t*) src_);
}
void *zmq_msg_data (zmq_msg_t *msg_)
{
if (!msg_) {
errno = EINVAL;
return NULL;
}
return ((zmq::msg_t*) msg_)->data ();
}
size_t zmq_msg_size (zmq_msg_t *msg_)
{
if (!msg_) {
errno = EINVAL;
return -1;
}
return ((zmq::msg_t*) msg_)->size ();
}
int zmq_getmsgopt (zmq_msg_t *msg_, int option_, void *optval_,
size_t *optvallen_)
{
if (!msg_ || !optval_ || !optvallen_) {
errno = EINVAL;
return -1;
}
switch (option_) {
case ZMQ_MORE:
if (*optvallen_ < sizeof (int)) {
......@@ -644,11 +564,6 @@ int zmq_getmsgopt (zmq_msg_t *msg_, int option_, void *optval_,
int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
{
if (!items_) {
errno = EFAULT;
return -1;
}
#if defined ZMQ_POLL_BASED_ON_POLL
if (unlikely (nitems_ < 0)) {
errno = EINVAL;
......@@ -668,6 +583,11 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
#endif
}
if (!items_) {
errno = EFAULT;
return -1;
}
zmq::clock_t clock;
uint64_t now = 0;
uint64_t end = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment