2 files changed, 2 insertions, 41 deletions

diff --git a/src/core/stream.c b/src/core/stream.c
index f1cf6301..4ac27705 100644
--- a/src/core/stream.c
+++ b/src/core/stream.c
@@ -290,12 +290,6 @@ nng_stream_listener_alloc(nng_stream_listener **lp, const char *uri)
 // Public stream options.
 
 int
-nng_stream_get(nng_stream *s, const char *n, void *v, size_t *szp)
-{
-	return (nni_stream_get(s, n, v, szp, NNI_TYPE_OPAQUE));
-}
-
-int
 nng_stream_get_int(nng_stream *s, const char *n, int *v)
 {
 	return (nni_stream_get(s, n, v, NULL, NNI_TYPE_INT32));
@@ -344,13 +338,6 @@ nng_stream_get_addr(nng_stream *s, const char *n, nng_sockaddr *v)
 }
 
 int
-nng_stream_dialer_get(
-    nng_stream_dialer *d, const char *n, void *v, size_t *szp)
-{
-	return (nni_stream_dialer_get(d, n, v, szp, NNI_TYPE_OPAQUE));
-}
-
-int
 nng_stream_dialer_get_int(nng_stream_dialer *d, const char *n, int *v)
 {
 	return (nni_stream_dialer_get(d, n, v, NULL, NNI_TYPE_INT32));
@@ -400,13 +387,6 @@ nng_stream_dialer_get_addr(
 }
 
 int
-nng_stream_listener_get(
-    nng_stream_listener *l, const char *n, void *v, size_t *szp)
-{
-	return (nni_stream_listener_get(l, n, v, szp, NNI_TYPE_OPAQUE));
-}
-
-int
 nng_stream_listener_get_int(nng_stream_listener *l, const char *n, int *v)
 {
 	return (nni_stream_listener_get(l, n, v, NULL, NNI_TYPE_INT32));
@@ -458,13 +438,6 @@ nng_stream_listener_get_addr(
 }
 
 int
-nng_stream_dialer_set(
-    nng_stream_dialer *d, const char *n, const void *v, size_t sz)
-{
-	return (nni_stream_dialer_set(d, n, v, sz, NNI_TYPE_OPAQUE));
-}
-
-int
 nng_stream_dialer_set_int(nng_stream_dialer *d, const char *n, int v)
 {
 	return (nni_stream_dialer_set(d, n, &v, sizeof(v), NNI_TYPE_INT32));
@@ -516,13 +489,6 @@ nng_stream_dialer_set_addr(
 }
 
 int
-nng_stream_listener_set(
-    nng_stream_listener *l, const char *n, const void *v, size_t sz)
-{
-	return (nni_stream_listener_set(l, n, v, sz, NNI_TYPE_OPAQUE));
-}
-
-int
 nng_stream_listener_set_int(nng_stream_listener *l, const char *n, int v)
 {
 	return (nni_stream_listener_set(l, n, &v, sizeof(v), NNI_TYPE_INT32));
diff --git a/src/supplemental/websocket/websocket_test.c b/src/supplemental/websocket/websocket_test.c
index d784c1bc..f648f740 100644
--- a/src/supplemental/websocket/websocket_test.c
+++ b/src/supplemental/websocket/websocket_test.c
@@ -172,15 +172,10 @@ test_websocket_conn_props(void)
 	NUTS_TRUE(sa1.s_in.sa_addr == sa2.s_in.sa_addr);
 	NUTS_TRUE(sa1.s_in.sa_port == sa2.s_in.sa_port);
 
-	on = false;
-	sz = sizeof(on);
-	NUTS_PASS(nng_stream_get(c1, NNG_OPT_TCP_NODELAY, &on, &sz));
-	NUTS_TRUE(sz == sizeof(on));
+	NUTS_PASS(nng_stream_get_bool(c1, NNG_OPT_TCP_NODELAY, &on));
 	NUTS_TRUE(on == true);
 
-	sz = sizeof(on);
-	NUTS_PASS(nng_stream_get(c2, NNG_OPT_TCP_KEEPALIVE, &on, &sz));
-	NUTS_TRUE(sz == sizeof(on));
+	NUTS_PASS(nng_stream_get_bool(c2, NNG_OPT_TCP_KEEPALIVE, &on));
 
 	NUTS_FAIL(
 	    nng_stream_get_size(c1, NNG_OPT_TCP_NODELAY, &sz), NNG_EBADTYPE);