aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2017-07-08 17:06:39 -0700
committerGarrett D'Amore <garrett@damore.org>2017-07-08 17:06:39 -0700
commitca9263880a8db50d302773b9ba8e2887a1ffeded (patch)
tree3c8095fa7c5fd22fb807707c3960b27702d8e7fd /src
parent3cedf14c3586b0770cb9ee62c75f922ab2006153 (diff)
downloadnng-ca9263880a8db50d302773b9ba8e2887a1ffeded.tar.gz
nng-ca9263880a8db50d302773b9ba8e2887a1ffeded.tar.bz2
nng-ca9263880a8db50d302773b9ba8e2887a1ffeded.zip
Various cleanups of unused bits.
Diffstat (limited to 'src')
-rw-r--r--src/core/options.c2
-rw-r--r--src/core/pipe.c1
-rw-r--r--src/core/timer.c1
-rw-r--r--src/platform/posix/posix_epdesc.c5
-rw-r--r--src/protocol/pair/pair.c1
-rw-r--r--src/protocol/pipeline/pull.c1
-rw-r--r--src/protocol/pipeline/push.c1
-rw-r--r--src/protocol/survey/survey.c1
-rw-r--r--src/transport/inproc/inproc.c1
-rw-r--r--src/transport/tcp/tcp.c2
10 files changed, 1 insertions, 15 deletions
diff --git a/src/core/options.c b/src/core/options.c
index 245172bf..d975c585 100644
--- a/src/core/options.c
+++ b/src/core/options.c
@@ -52,7 +52,7 @@ int
nni_setopt_size(size_t *ptr, const void *val, size_t size, size_t minval,
size_t maxval)
{
- int v;
+ size_t v;
if (size != sizeof (v)) {
return (NNG_EINVAL);
diff --git a/src/core/pipe.c b/src/core/pipe.c
index eaf4fa1c..9151ede0 100644
--- a/src/core/pipe.c
+++ b/src/core/pipe.c
@@ -199,7 +199,6 @@ nni_pipe_create(nni_pipe **pp, nni_ep *ep, nni_sock *sock, nni_tran *tran)
nni_pipe *p;
int rv;
uint32_t id;
- void *pdata;
rv = nni_objhash_alloc(nni_pipes, &id, (void **) &p);
if (rv != 0) {
diff --git a/src/core/timer.c b/src/core/timer.c
index 085a297a..b6be0b52 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -135,7 +135,6 @@ nni_timer_loop(void *arg)
{
nni_timer *timer = arg;
nni_time now;
- nni_time expire;
nni_timer_node *node;
for (;;) {
diff --git a/src/platform/posix/posix_epdesc.c b/src/platform/posix/posix_epdesc.c
index f64e25e9..242f61fc 100644
--- a/src/platform/posix/posix_epdesc.c
+++ b/src/platform/posix/posix_epdesc.c
@@ -42,11 +42,6 @@ struct nni_posix_epdesc {
socklen_t loclen;
socklen_t remlen;
const char * url;
- struct sockaddr_storage * remaddrs;
- struct sockaddr_storage * locaddrs;
- int nremaddrs;
- int nlocaddrs;
- int server;
nni_mtx mtx;
};
diff --git a/src/protocol/pair/pair.c b/src/protocol/pair/pair.c
index 326e0c0e..b283377e 100644
--- a/src/protocol/pair/pair.c
+++ b/src/protocol/pair/pair.c
@@ -212,7 +212,6 @@ nni_pair_getq_cb(void *arg)
{
nni_pair_pipe *ppipe = arg;
nni_pair_sock *psock = ppipe->psock;
- nni_msg *msg;
if (nni_aio_result(&ppipe->aio_getq) != 0) {
nni_pipe_stop(ppipe->npipe);
diff --git a/src/protocol/pipeline/pull.c b/src/protocol/pipeline/pull.c
index fd3d1e29..27fd5478 100644
--- a/src/protocol/pipeline/pull.c
+++ b/src/protocol/pipeline/pull.c
@@ -147,7 +147,6 @@ nni_pull_putq_cb(void *arg)
{
nni_pull_pipe *pp = arg;
nni_aio *aio = &pp->putq_aio;
- int rv;
if (nni_aio_result(aio) != 0) {
// If we failed to put, probably NNG_ECLOSED, nothing else
diff --git a/src/protocol/pipeline/push.c b/src/protocol/pipeline/push.c
index e39adb7a..bbda91da 100644
--- a/src/protocol/pipeline/push.c
+++ b/src/protocol/pipeline/push.c
@@ -45,7 +45,6 @@ static int
nni_push_sock_init(void **pushp, nni_sock *sock)
{
nni_push_sock *push;
- int rv;
if ((push = NNI_ALLOC_STRUCT(push)) == NULL) {
return (NNG_ENOMEM);
diff --git a/src/protocol/survey/survey.c b/src/protocol/survey/survey.c
index db2dd80c..14d73028 100644
--- a/src/protocol/survey/survey.c
+++ b/src/protocol/survey/survey.c
@@ -265,7 +265,6 @@ nni_surv_recv_cb(void *arg)
{
nni_surv_pipe *ppipe = arg;
nni_msg *msg;
- int rv;
if (nni_aio_result(&ppipe->aio_recv) != 0) {
goto failed;
diff --git a/src/transport/inproc/inproc.c b/src/transport/inproc/inproc.c
index 0489ea38..01ffd39a 100644
--- a/src/transport/inproc/inproc.c
+++ b/src/transport/inproc/inproc.c
@@ -221,7 +221,6 @@ static int
nni_inproc_ep_init(void **epp, const char *url, nni_sock *sock, int mode)
{
nni_inproc_ep *ep;
- int rv;
if (strlen(url) > NNG_MAXADDRLEN-1) {
return (NNG_EINVAL);
diff --git a/src/transport/tcp/tcp.c b/src/transport/tcp/tcp.c
index 7d66d366..4b0f77f1 100644
--- a/src/transport/tcp/tcp.c
+++ b/src/transport/tcp/tcp.c
@@ -438,7 +438,6 @@ static int
nni_tcp_parse_pair(char *pair, char **hostp, char **servp)
{
char *host, *serv, *end;
- char c;
if (pair[0] == '[') {
host = pair+1;
@@ -522,7 +521,6 @@ static void
nni_tcp_pipe_start(void *arg, nni_aio *aio)
{
nni_tcp_pipe *pipe = arg;
- int rv;
nni_mtx_lock(&pipe->mtx);
pipe->txlen[0] = 0;