5 files changed, 20 insertions, 27 deletions
diff --git a/src/platform/posix/posix_ipcconn.c b/src/platform/posix/posix_ipcconn.c
index 11bd03d8..29550b7f 100644
--- a/src/platform/posix/posix_ipcconn.c
+++ b/src/platform/posix/posix_ipcconn.c
@@ -299,12 +299,11 @@ ipc_recv(void *arg, nni_aio *aio)
 	nni_mtx_unlock(&c->mtx);
 }
 
-static nng_err
-ipc_sock_addr(void *arg, const nng_sockaddr **sap)
+static const nng_sockaddr *
+ipc_sock_addr(void *arg)
 {
 	ipc_conn *c = arg;
-	*sap        = &c->sa;
-	return (NNG_OK);
+	return (&c->sa);
 }
 
 static nng_err
diff --git a/src/platform/posix/posix_sockfd.c b/src/platform/posix/posix_sockfd.c
index 43225e7e..6a08f5c6 100644
--- a/src/platform/posix/posix_sockfd.c
+++ b/src/platform/posix/posix_sockfd.c
@@ -431,13 +431,12 @@ sfd_set(void *arg, const char *name, const void *buf, size_t sz, nni_type t)
 	return (nni_setopt(sfd_options, name, c, buf, sz, t));
 }
 
-static nng_err
-sfd_addr(void *arg, const nng_sockaddr **sap)
+static const nng_sockaddr *
+sfd_addr(void *arg)
 {
 	static nng_sockaddr sa = { .s_family = NNG_AF_UNSPEC };
 	NNI_ARG_UNUSED(arg);
-	*sap = &sa;
-	return (NNG_OK);
+	return &sa;
 }
 
 nng_err
diff --git a/src/platform/posix/posix_tcpconn.c b/src/platform/posix/posix_tcpconn.c
index 43dfb4e4..c04c27c1 100644
--- a/src/platform/posix/posix_tcpconn.c
+++ b/src/platform/posix/posix_tcpconn.c
@@ -332,20 +332,18 @@ tcp_recv(void *arg, nni_aio *aio)
 	nni_mtx_unlock(&c->mtx);
 }
 
-static nng_err
-tcp_get_peer_addr(void *arg, const nng_sockaddr **addr)
+static const nng_sockaddr *
+tcp_get_peer_addr(void *arg)
 {
 	nni_tcp_conn *c = arg;
-	*addr           = &c->peer;
-	return (NNG_OK);
+	return (&c->peer);
 }
 
-static nng_err
-tcp_get_self_addr(void *arg, const nng_sockaddr **addr)
+static const nng_sockaddr *
+tcp_get_self_addr(void *arg)
 {
 	nni_tcp_conn *c = arg;
-	*addr           = &c->self;
-	return (NNG_OK);
+	return (&c->self);
 }
 
 static nng_err
diff --git a/src/platform/windows/win_ipcconn.c b/src/platform/windows/win_ipcconn.c
index a5ef16a6..b20c90bd 100644
--- a/src/platform/windows/win_ipcconn.c
+++ b/src/platform/windows/win_ipcconn.c
@@ -431,12 +431,11 @@ ipc_get(void *arg, const char *nm, void *val, size_t *szp, nni_opt_type t)
 	return (nni_getopt(ipc_conn_options, nm, c, val, szp, t));
 }
 
-static nng_err
-ipc_addr(void *arg, const nng_sockaddr **sap)
+static const nng_sockaddr *
+ipc_addr(void *arg)
 {
 	ipc_conn *c = arg;
-	*sap        = &c->sa;
-	return (NNG_OK);
+	return (&c->sa);
 }
 
 int
diff --git a/src/platform/windows/win_tcpconn.c b/src/platform/windows/win_tcpconn.c
index dae6b58d..ef1594db 100644
--- a/src/platform/windows/win_tcpconn.c
+++ b/src/platform/windows/win_tcpconn.c
@@ -289,20 +289,18 @@ tcp_get_keepalive(void *arg, void *buf, size_t *szp, nni_type t)
 	return (nni_copyout_bool(b, buf, szp, t));
 }
 
-static nng_err
-tcp_self_addr(void *arg, const nng_sockaddr **sap)
+static const nng_sockaddr *
+tcp_self_addr(void *arg)
 {
 	nni_tcp_conn *c = arg;
-	*sap            = &c->sockname;
-	return (NNG_OK);
+	return (&c->sockname);
 }
 
-static nng_err
+static const nng_sockaddr *
 tcp_peer_addr(void *arg, const nng_sockaddr **sap)
 {
 	nni_tcp_conn *c = arg;
-	*sap            = &c->peername;
-	return (NNG_OK);
+	return (&c->peername);
 }
 
 static const nni_option tcp_options[] = {