From 4367013d8b56105edd0d27d0b9b6da2becab9717 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sun, 3 Nov 2024 08:38:22 -0800 Subject: Remove untyped stream option functions. The underlying stream APIs have no need for untyped accessors. Another step on the road to removal of NNI_TYPE_OPAQUE. --- src/core/stream.c | 34 ----------------------------- src/supplemental/websocket/websocket_test.c | 9 ++------ 2 files changed, 2 insertions(+), 41 deletions(-) (limited to 'src') 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 @@ -289,12 +289,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) { @@ -343,13 +337,6 @@ nng_stream_get_addr(nng_stream *s, const char *n, nng_sockaddr *v) return (nni_stream_get(s, n, v, NULL, NNI_TYPE_SOCKADDR)); } -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) { @@ -399,13 +386,6 @@ nng_stream_dialer_get_addr( return (nni_stream_dialer_get(d, n, v, NULL, NNI_TYPE_SOCKADDR)); } -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) { @@ -457,13 +437,6 @@ nng_stream_listener_get_addr( return (nni_stream_listener_get(l, n, v, NULL, NNI_TYPE_SOCKADDR)); } -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) { @@ -515,13 +488,6 @@ nng_stream_dialer_set_addr( return (nni_stream_dialer_set(d, n, v, sizeof(*v), NNI_TYPE_SOCKADDR)); } -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) { 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); -- cgit v1.2.3-70-g09d2