More nng_err -- this time for dialer and listener allocations.

8 files changed, 20 insertions, 21 deletions

diff --git a/src/platform/posix/posix_ipcdial.c b/src/platform/posix/posix_ipcdial.c
index d299f947..f9e87b72 100644
--- a/src/platform/posix/posix_ipcdial.c
+++ b/src/platform/posix/posix_ipcdial.c
@@ -304,7 +304,7 @@ ipc_dialer_set(
 	return (nni_setopt(ipc_dialer_options, nm, d, buf, sz, t));
 }
 
-int
+nng_err
 nni_ipc_dialer_alloc(nng_stream_dialer **dp, const nng_url *url)
 {
 	ipc_dialer *d;
diff --git a/src/platform/posix/posix_ipclisten.c b/src/platform/posix/posix_ipclisten.c
index 98432f71..ea540918 100644
--- a/src/platform/posix/posix_ipclisten.c
+++ b/src/platform/posix/posix_ipclisten.c
@@ -505,7 +505,7 @@ ipc_listener_accept(void *arg, nni_aio *aio)
 	nni_mtx_unlock(&l->mtx);
 }
 
-int
+nng_err
 nni_ipc_listener_alloc(nng_stream_listener **lp, const nng_url *url)
 {
 	ipc_listener *l;
@@ -560,5 +560,5 @@ nni_ipc_listener_alloc(nng_stream_listener **lp, const nng_url *url)
 	l->sl.sl_set    = ipc_listener_set;
 
 	*lp = (void *) l;
-	return (0);
+	return (NNG_OK);
 }
diff --git a/src/platform/posix/posix_sockfd.c b/src/platform/posix/posix_sockfd.c
index bc411252..a76ef85f 100644
--- a/src/platform/posix/posix_sockfd.c
+++ b/src/platform/posix/posix_sockfd.c
@@ -448,7 +448,7 @@ 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));
 }
 
-int
+nng_err
 nni_sfd_conn_alloc(nni_sfd_conn **cp, int fd)
 {
 	nni_sfd_conn *c;
@@ -473,7 +473,7 @@ nni_sfd_conn_alloc(nni_sfd_conn **cp, int fd)
 	c->stream.s_set   = sfd_set;
 
 	*cp = c;
-	return (0);
+	return (NNG_OK);
 }
 
 void
diff --git a/src/platform/posix/posix_tcplisten.c b/src/platform/posix/posix_tcplisten.c
index 13ecb33e..73374dc5 100644
--- a/src/platform/posix/posix_tcplisten.c
+++ b/src/platform/posix/posix_tcplisten.c
@@ -506,7 +506,7 @@ tcp_listener_set(
 	return (nni_setopt(tcp_listener_options, name, arg, buf, sz, t));
 }
 
-static int
+static nng_err
 tcp_listener_alloc_addr(nng_stream_listener **lp, const nng_sockaddr *sa)
 {
 	tcp_listener *l;
@@ -532,16 +532,16 @@ tcp_listener_alloc_addr(nng_stream_listener **lp, const nng_sockaddr *sa)
 	l->ops.sl_set    = tcp_listener_set;
 
 	*lp = (void *) l;
-	return (0);
+	return (NNG_OK);
 }
 
-int
+nng_err
 nni_tcp_listener_alloc(nng_stream_listener **lp, const nng_url *url)
 {
-	int          rv;
+	nng_err      rv;
 	nng_sockaddr sa;
 
-	if ((rv = nni_url_to_address(&sa, url)) != 0) {
+	if ((rv = nni_url_to_address(&sa, url)) != NNG_OK) {
 		return (rv);
 	}
 
diff --git a/src/platform/windows/win_ipcdial.c b/src/platform/windows/win_ipcdial.c
index 43c1f744..ae42837c 100644
--- a/src/platform/windows/win_ipcdial.c
+++ b/src/platform/windows/win_ipcdial.c
@@ -238,7 +238,7 @@ ipc_dialer_get(void *arg, const char *nm, void *buf, size_t *szp, nni_type t)
 	return (nni_getopt(ipc_dialer_options, nm, d, buf, szp, t));
 }
 
-int
+nng_err
 nni_ipc_dialer_alloc(nng_stream_dialer **dp, const nng_url *url)
 {
 	ipc_dialer *d;
@@ -269,7 +269,7 @@ nni_ipc_dialer_alloc(nng_stream_dialer **dp, const nng_url *url)
 	d->sd.sd_set          = ipc_dialer_set;
 	nni_aio_list_init(&d->aios);
 	*dp = (void *) d;
-	return (0);
+	return (NNG_OK);
 }
 
 int
diff --git a/src/platform/windows/win_ipclisten.c b/src/platform/windows/win_ipclisten.c
index e40f51d7..56ec5cc3 100644
--- a/src/platform/windows/win_ipclisten.c
+++ b/src/platform/windows/win_ipclisten.c
@@ -348,7 +348,7 @@ ipc_listener_free(void *arg)
 	NNI_FREE_STRUCT(l);
 }
 
-int
+nng_err
 nni_ipc_listener_alloc(nng_stream_listener **lp, const nng_url *url)
 {
 	ipc_listener *l;
diff --git a/src/platform/windows/win_socketpair.c b/src/platform/windows/win_socketpair.c
index f97df2fd..57820c72 100644
--- a/src/platform/windows/win_socketpair.c
+++ b/src/platform/windows/win_socketpair.c
@@ -9,7 +9,6 @@
 
 #include "core/nng_impl.h"
 
-
 #ifdef NNG_HAVE_SOCKETPAIR_TODO
 // TODO: Windows lacks socketpair.  We can emulate it with an explcit
 // implementation based on AF_UNIX.
@@ -46,7 +45,7 @@ nni_sfd_close_fd(int fd)
 	NNI_ARG_UNUSED(fd);
 }
 
-int
+nng_err
 nni_sfd_conn_alloc(nni_sfd_conn **cp, int fd)
 {
 	NNI_ARG_UNUSED(cp);
diff --git a/src/platform/windows/win_tcplisten.c b/src/platform/windows/win_tcplisten.c
index c8c6ab2c..aa4a18e9 100644
--- a/src/platform/windows/win_tcplisten.c
+++ b/src/platform/windows/win_tcplisten.c
@@ -543,11 +543,11 @@ tcp_listener_set(
 	return (nni_setopt(tcp_listener_options, name, arg, buf, sz, t));
 }
 
-static int
+static nng_err
 tcp_listener_alloc_addr(nng_stream_listener **lp, const nng_sockaddr *sa)
 {
 	tcp_listener *l;
-	int           rv;
+	nng_err       rv;
 
 	if ((l = NNI_ALLOC_STRUCT(l)) == NULL) {
 		return (NNG_ENOMEM);
@@ -576,16 +576,16 @@ tcp_listener_alloc_addr(nng_stream_listener **lp, const nng_sockaddr *sa)
 	l->ops.sl_set    = tcp_listener_set;
 
 	*lp = (void *) l;
-	return (0);
+	return (NNG_OK);
 }
 
-int
+nng_err
 nni_tcp_listener_alloc(nng_stream_listener **lp, const nng_url *url)
 {
-	int          rv;
+	nng_err      rv;
 	nng_sockaddr sa;
 
-	if ((rv = nni_url_to_address(&sa, url)) != 0) {
+	if ((rv = nni_url_to_address(&sa, url)) != NNG_OK) {
 		return (rv);
 	}