Plumb sockaddrs all the way through pipes, make them failsafe.

These functions can no longer fail.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/supplemental/websocket/websocket.c b/src/supplemental/websocket/websocket.c
index 2ff126e3..82cac05e 100644
--- a/src/supplemental/websocket/websocket.c
+++ b/src/supplemental/websocket/websocket.c
@@ -193,8 +193,8 @@ static void    ws_str_send(void *, nng_aio *);
 static void    ws_str_recv(void *, nng_aio *);
 static nng_err ws_str_get(void *, const char *, void *, size_t *, nni_type);
 static nng_err ws_str_peer_cert(void *, nng_tls_cert **);
-static nng_err ws_str_self_addr(void *, const nng_sockaddr **);
-static nng_err ws_str_peer_addr(void *, const nng_sockaddr **);
+static const nng_sockaddr *ws_str_self_addr(void *);
+static const nng_sockaddr *ws_str_peer_addr(void *);
 
 static void ws_listener_close(void *);
 static void ws_listener_free(void *);
@@ -2846,16 +2846,16 @@ ws_str_peer_cert(void *arg, nng_tls_cert **certp)
 	return (nni_http_conn_peer_cert(ws->http, certp));
 }
 
-static nng_err
-ws_str_peer_addr(void *arg, const nng_sockaddr **sap)
+static const nng_sockaddr *
+ws_str_peer_addr(void *arg)
 {
 	nni_ws *ws = arg;
-	return (nni_http_peer_addr(ws->http, sap));
+	return (nni_http_peer_addr(ws->http));
 }
 
-static nng_err
-ws_str_self_addr(void *arg, const nng_sockaddr **sap)
+static const nng_sockaddr *
+ws_str_self_addr(void *arg)
 {
 	nni_ws *ws = arg;
-	return (nni_http_self_addr(ws->http, sap));
+	return (nni_http_self_addr(ws->http));
 }