6 files changed, 3 insertions, 16 deletions
diff --git a/src/core/device.c b/src/core/device.c
index 7b2b5b87..7d0454bd 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -56,7 +56,6 @@ static void
 nni_device_rev(void *p)
 {
 	nni_device_pair *pair = p;
-	int rv;
 
 	pair->err[1] = nni_device_loop(pair->socks[1], pair->socks[0]);
 	nni_sock_shutdown(pair->socks[0]);
diff --git a/src/core/event.c b/src/core/event.c
index b0e02b16..df9618ca 100644
--- a/src/core/event.c
+++ b/src/core/event.c
@@ -15,8 +15,6 @@
 int
 nni_ev_init(nni_event *event, int type, nni_sock *sock)
 {
-	int rv;
-
 	memset(event, 0, sizeof (*event));
 	event->e_type = type;
 	event->e_sock = sock;
diff --git a/src/core/msgqueue.c b/src/core/msgqueue.c
index 985563ad..a69af47c 100644
--- a/src/core/msgqueue.c
+++ b/src/core/msgqueue.c
@@ -510,7 +510,6 @@ nni_msgq_run_timeout(void *arg)
 	nni_time exp;
 	nni_aio *aio;
 	nni_aio *naio;
-	int rv;
 
 	now = nni_clock();
 	exp = NNI_TIME_NEVER;
diff --git a/src/core/objhash.c b/src/core/objhash.c
index 99ab7560..da4c6012 100644
--- a/src/core/objhash.c
+++ b/src/core/objhash.c
@@ -137,7 +137,6 @@ nni_objhash_find_node(nni_objhash *oh, uint32_t id)
 int
 nni_objhash_find(nni_objhash *oh, uint32_t id, void **valp)
 {
-	uint32_t index;
 	nni_objhash_node *node;
 	int rv;
 
@@ -242,7 +241,6 @@ nni_objhash_resize(nni_objhash *oh, int grow)
 void
 nni_objhash_unref(nni_objhash *oh, uint32_t id)
 {
-	int rv;
 	void *val;
 	uint32_t index;
 	nni_objhash_node *node;
@@ -309,7 +307,6 @@ nni_objhash_unref(nni_objhash *oh, uint32_t id)
 void
 nni_objhash_unref_wait(nni_objhash *oh, uint32_t id)
 {
-	int rv;
 	void *val;
 	uint32_t index;
 	nni_objhash_node *node;
diff --git a/src/core/platform.h b/src/core/platform.h
index 11a01abb..107b180e 100644
--- a/src/core/platform.h
+++ b/src/core/platform.h
@@ -76,9 +76,9 @@ extern void *nni_alloc(size_t);
 // Most implementations can just call free() here.
 extern void nni_free(void *, size_t);
 
-typedef struct nni_plat_mtx		nni_plat_mtx;
-typedef struct nni_plat_cv		nni_plat_cv;
-typedef struct nni_plat_thr		nni_plat_thr;
+typedef struct nni_plat_mtx	nni_plat_mtx;
+typedef struct nni_plat_cv	nni_plat_cv;
+typedef struct nni_plat_thr	nni_plat_thr;
 
 //
 // Threading & Synchronization Support
diff --git a/src/core/socket.c b/src/core/socket.c
index 66f5c63b..f7712aa3 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -472,7 +472,6 @@ nni_sock_shutdown(nni_sock *sock)
 	nni_pipe *pipe;
 	nni_ep *ep;
 	nni_time linger;
-	int i;
 
 	nni_mtx_lock(&sock->s_mx);
 	if (sock->s_closing) {
@@ -577,8 +576,6 @@ nni_sock_shutdown(nni_sock *sock)
 int
 nni_sock_ep_add(nni_sock *sock, nni_ep *ep)
 {
-	int rv;
-
 	nni_mtx_lock(&sock->s_mx);
 	if (sock->s_closing) {
 		nni_mtx_unlock(&sock->s_mx);
@@ -613,9 +610,6 @@ nni_sock_ep_remove(nni_sock *sock, nni_ep *ep)
 void
 nni_sock_close(nni_sock *sock)
 {
-	int i;
-	nni_notify *notify;
-
 	// Shutdown everything if not already done.  This operation
 	// is idempotent.
 	nni_sock_shutdown(sock);