1 files changed, 4 insertions, 20 deletions

diff --git a/src/nng.c b/src/nng.c
index 8fafe364..5ea21d21 100644
--- a/src/nng.c
+++ b/src/nng.c
@@ -410,10 +410,8 @@ ctx_get(nng_ctx id, const char *n, void *v, size_t *szp, nni_type t)
 	nni_ctx *ctx;
 	int      rv;
 
-	if ((rv = nni_init()) != 0) {
-		return (rv);
-	}
-	if ((rv = nni_ctx_find(&ctx, id.id, false)) != 0) {
+	if (((rv = nni_init()) != 0) ||
+	    ((rv = nni_ctx_find(&ctx, id.id, false)) != 0)) {
 		return (rv);
 	}
 	rv = nni_ctx_getopt(ctx, n, v, szp, t);
@@ -422,12 +420,6 @@ ctx_get(nng_ctx id, const char *n, void *v, size_t *szp, nni_type t)
 }
 
 int
-nng_ctx_get(nng_ctx id, const char *n, void *v, size_t *szp)
-{
-	return (ctx_get(id, n, v, szp, NNI_TYPE_OPAQUE));
-}
-
-int
 nng_ctx_get_int(nng_ctx id, const char *n, int *v)
 {
 	return (ctx_get(id, n, v, NULL, NNI_TYPE_INT32));
@@ -475,10 +467,8 @@ ctx_set(nng_ctx id, const char *n, const void *v, size_t sz, nni_type t)
 	nni_ctx *ctx;
 	int      rv;
 
-	if ((rv = nni_init()) != 0) {
-		return (rv);
-	}
-	if ((rv = nni_ctx_find(&ctx, id.id, false)) != 0) {
+	if (((rv = nni_init()) != 0) ||
+	    ((rv = nni_ctx_find(&ctx, id.id, false)) != 0)) {
 		return (rv);
 	}
 	rv = nni_ctx_setopt(ctx, n, v, sz, t);
@@ -487,12 +477,6 @@ ctx_set(nng_ctx id, const char *n, const void *v, size_t sz, nni_type t)
 }
 
 int
-nng_ctx_set(nng_ctx id, const char *n, const void *v, size_t sz)
-{
-	return (ctx_set(id, n, v, sz, NNI_TYPE_OPAQUE));
-}
-
-int
 nng_ctx_set_int(nng_ctx id, const char *n, int v)
 {
 	return (ctx_set(id, n, &v, sizeof(v), NNI_TYPE_INT32));