aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2017-01-16 00:43:03 -0800
committerGarrett D'Amore <garrett@damore.org>2017-01-16 00:43:03 -0800
commit39dbff5615631522d3ef98b83141957038502c0d (patch)
tree89becbf88ebb79df9c9202450acd476bd790bde0 /src/core
parentf71209a0b429cddcd44f1f2473c49e986c9b4be7 (diff)
downloadnng-39dbff5615631522d3ef98b83141957038502c0d.tar.gz
nng-39dbff5615631522d3ef98b83141957038502c0d.tar.bz2
nng-39dbff5615631522d3ef98b83141957038502c0d.zip
Various complaints found in AppVeyor build.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/endpt.c1
-rw-r--r--src/core/idhash.c4
-rw-r--r--src/core/message.c6
-rw-r--r--src/core/options.c2
-rw-r--r--src/core/socket.c4
5 files changed, 6 insertions, 11 deletions
diff --git a/src/core/endpt.c b/src/core/endpt.c
index c4673376..09ef0884 100644
--- a/src/core/endpt.c
+++ b/src/core/endpt.c
@@ -139,7 +139,6 @@ static void
nni_dialer(void *arg)
{
nni_ep *ep = arg;
- nni_pipe *pipe;
int rv;
nni_time cooldown;
nni_mtx *mx = &ep->ep_sock->s_mx;
diff --git a/src/core/idhash.c b/src/core/idhash.c
index 58b68bbf..d816ddf4 100644
--- a/src/core/idhash.c
+++ b/src/core/idhash.c
@@ -91,7 +91,7 @@ nni_hash_resize(nni_idhash *h)
uint32_t oldsize;
nni_idhash_entry *newents;
nni_idhash_entry *oldents;
- int i;
+ uint32_t i;
if ((h->ih_load < h->ih_maxload) && (h->ih_load >= h->ih_minload)) {
// No resize needed.
@@ -231,7 +231,7 @@ nni_idhash_count(nni_idhash *h, uint32_t *countp)
int
nni_idhash_walk(nni_idhash *h, nni_idhash_walkfn fn, void *arg)
{
- int i, rv;
+ uint32_t i, rv;
for (i = 0; i < h->ih_cap; i++) {
nni_idhash_entry *ent = &h->ih_entries[i];
diff --git a/src/core/message.c b/src/core/message.c
index 4c666955..778e7dfc 100644
--- a/src/core/message.c
+++ b/src/core/message.c
@@ -41,7 +41,7 @@ typedef struct {
static void
nni_chunk_dump(const nni_chunk *chunk, char *prefix)
{
- int i, j;
+ size_t i, j;
uint8_t x;
char buf[128];
@@ -59,7 +59,7 @@ nni_chunk_dump(const nni_chunk *chunk, char *prefix)
nni_println(buf);
j = 0;
}
- snprintf(buf, sizeof (buf), " %4x: ", i);
+ snprintf(buf, sizeof (buf), " %4x: ", (unsigned) i);
j += strlen(buf);
}
buf[j++] = ' ';
@@ -413,7 +413,7 @@ nni_msg_getopt(nni_msg *m, int opt, void *val, size_t *szp)
NNI_LIST_FOREACH (&m->m_options, mo) {
if (mo->mo_num == opt) {
- int sz = *szp;
+ size_t sz = *szp;
if (sz > mo->mo_sz) {
sz = mo->mo_sz;
memcpy(val, mo->mo_val, sz);
diff --git a/src/core/options.c b/src/core/options.c
index 24d7a9eb..32b65ebf 100644
--- a/src/core/options.c
+++ b/src/core/options.c
@@ -103,7 +103,7 @@ nni_getopt_buf(nni_msgq *mq, void *val, size_t *sizep)
{
int len = nni_msgq_cap(mq);
- int sz = *sizep;
+ size_t sz = *sizep;
if (sz > sizeof (len)) {
sz = sizeof (len);
diff --git a/src/core/socket.c b/src/core/socket.c
index c6b0408e..ae7cbc13 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -567,8 +567,6 @@ nni_sock_senderr(nni_sock *sock, int err)
int
nni_sock_setopt(nni_sock *sock, int opt, const void *val, size_t size)
{
- size_t rsz;
- void *ptr;
int rv = ENOTSUP;
nni_mtx_lock(&sock->s_mx);
@@ -612,8 +610,6 @@ nni_sock_setopt(nni_sock *sock, int opt, const void *val, size_t size)
int
nni_sock_getopt(nni_sock *sock, int opt, void *val, size_t *sizep)
{
- size_t rsz;
- void *ptr;
int rv = ENOTSUP;
nni_mtx_lock(&sock->s_mx);