diff options
| author | Nathan Kent <nkent2@cs.rochester.edu> | 2019-04-28 02:37:29 -0400 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2019-05-19 11:59:57 -0700 |
| commit | d83d86a140c44cca5f1867479ea7e77a0550e299 (patch) | |
| tree | 79e62882025039b42ae297b0a12bf19f9355127b /src/protocol/pubsub0/sub.c | |
| parent | ff78f0074248b6920bad1e9ec5fa455cc989545b (diff) | |
| download | nng-d83d86a140c44cca5f1867479ea7e77a0550e299.tar.gz nng-d83d86a140c44cca5f1867479ea7e77a0550e299.tar.bz2 nng-d83d86a140c44cca5f1867479ea7e77a0550e299.zip | |
fixes #923 #935 RECVBUF/SENDBUF has variable type
Diffstat (limited to 'src/protocol/pubsub0/sub.c')
| -rw-r--r-- | src/protocol/pubsub0/sub.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/protocol/pubsub0/sub.c b/src/protocol/pubsub0/sub.c index 9c71fb04..938ce332 100644 --- a/src/protocol/pubsub0/sub.c +++ b/src/protocol/pubsub0/sub.c @@ -434,12 +434,12 @@ sub0_ctx_get_recvbuf(void *arg, void *buf, size_t *szp, nni_type t) { sub0_ctx * ctx = arg; sub0_sock *sock = ctx->sock; - size_t val; + int val; nni_mtx_lock(&sock->lk); - val = nni_lmq_cap(&ctx->lmq); + val = (int) nni_lmq_cap(&ctx->lmq); nni_mtx_unlock(&sock->lk); - return (nni_copyout_size(val, buf, szp, t)); + return (nni_copyout_int(val, buf, szp, t)); } static int @@ -447,14 +447,14 @@ sub0_ctx_set_recvbuf(void *arg, const void *buf, size_t sz, nni_type t) { sub0_ctx * ctx = arg; sub0_sock *sock = ctx->sock; - size_t val; + int val; int rv; - if ((rv = nni_copyin_size(&val, buf, sz, 1, 8192, t)) != 0) { + if ((rv = nni_copyin_int(&val, buf, sz, 1, 8192, t)) != 0) { return (rv); } nni_mtx_lock(&sock->lk); - if ((rv = nni_lmq_resize(&ctx->lmq, val)) != 0) { + if ((rv = nni_lmq_resize(&ctx->lmq, (size_t) val)) != 0) { nni_mtx_unlock(&sock->lk); return (rv); } @@ -462,7 +462,7 @@ sub0_ctx_set_recvbuf(void *arg, const void *buf, size_t sz, nni_type t) // If we change the socket, then this will change the queue for // any new contexts. (Previously constructed contexts are unaffected.) if (sock->ctx == ctx) { - sock->recvbuflen = val; + sock->recvbuflen = (size_t) val; } nni_mtx_unlock(&sock->lk); return (0); |