1 files changed, 23 insertions, 23 deletions

diff --git a/src/sp/transport/ws/websocket.c b/src/sp/transport/ws/websocket.c
index df157e02..b6045306 100644
--- a/src/sp/transport/ws/websocket.c
+++ b/src/sp/transport/ws/websocket.c
@@ -505,12 +505,12 @@ error:
 	nni_mtx_unlock(&l->mtx);
 }
 
-static int
+static nng_err
 wstran_dialer_init(void *arg, nng_url *url, nni_dialer *ndialer)
 {
 	ws_dialer *d = arg;
 	nni_sock  *s = nni_dialer_sock(ndialer);
-	int        rv;
+	nng_err    rv;
 	char       name[64];
 
 	nni_mtx_init(&d->mtx);
@@ -524,22 +524,22 @@ wstran_dialer_init(void *arg, nng_url *url, nni_dialer *ndialer)
 	snprintf(
 	    name, sizeof(name), "%s.sp.nanomsg.org", nni_sock_peer_name(s));
 
-	if (((rv = nni_ws_dialer_alloc(&d->dialer, url)) != 0) ||
+	if (((rv = nni_ws_dialer_alloc(&d->dialer, url)) != NNG_OK) ||
 	    ((rv = nng_stream_dialer_set_bool(
-	          d->dialer, NNI_OPT_WS_MSGMODE, true)) != 0) ||
+	          d->dialer, NNI_OPT_WS_MSGMODE, true)) != NNG_OK) ||
 	    ((rv = nng_stream_dialer_set_string(
-	          d->dialer, NNG_OPT_WS_PROTOCOL, name)) != 0)) {
+	          d->dialer, NNG_OPT_WS_PROTOCOL, name)) != NNG_OK)) {
 		return (rv);
 	}
 
-	return (0);
+	return (NNG_OK);
 }
 
-static int
+static nng_err
 wstran_listener_init(void *arg, nng_url *url, nni_listener *listener)
 {
 	ws_listener *l = arg;
-	int          rv;
+	nng_err      rv;
 	nni_sock    *s = nni_listener_sock(listener);
 	char         name[64];
 
@@ -555,14 +555,14 @@ wstran_listener_init(void *arg, nng_url *url, nni_listener *listener)
 	snprintf(
 	    name, sizeof(name), "%s.sp.nanomsg.org", nni_sock_proto_name(s));
 
-	if (((rv = nni_ws_listener_alloc(&l->listener, url)) != 0) ||
+	if (((rv = nni_ws_listener_alloc(&l->listener, url)) != NNG_OK) ||
 	    ((rv = nng_stream_listener_set_bool(
-	          l->listener, NNI_OPT_WS_MSGMODE, true)) != 0) ||
+	          l->listener, NNI_OPT_WS_MSGMODE, true)) != NNG_OK) ||
 	    ((rv = nng_stream_listener_set_string(
-	          l->listener, NNG_OPT_WS_PROTOCOL, name)) != 0)) {
+	          l->listener, NNG_OPT_WS_PROTOCOL, name)) != NNG_OK)) {
 		return (rv);
 	}
-	return (0);
+	return (NNG_OK);
 }
 
 static void
@@ -582,12 +582,12 @@ static const nni_option wstran_ep_opts[] = {
 	},
 };
 
-static int
+static nng_err
 wstran_dialer_getopt(
     void *arg, const char *name, void *buf, size_t *szp, nni_type t)
 {
 	ws_dialer *d = arg;
-	int        rv;
+	nng_err    rv;
 
 	rv = nni_stream_dialer_get(d->dialer, name, buf, szp, t);
 	if (rv == NNG_ENOTSUP) {
@@ -596,12 +596,12 @@ wstran_dialer_getopt(
 	return (rv);
 }
 
-static int
+static nng_err
 wstran_dialer_setopt(
     void *arg, const char *name, const void *buf, size_t sz, nni_type t)
 {
 	ws_dialer *d = arg;
-	int        rv;
+	nng_err    rv;
 
 	rv = nni_stream_dialer_set(d->dialer, name, buf, sz, t);
 	if (rv == NNG_ENOTSUP) {
@@ -610,21 +610,21 @@ wstran_dialer_setopt(
 	return (rv);
 }
 
-static int
+static nng_err
 wstran_dialer_get_tls(void *arg, nng_tls_config **tls)
 {
 	ws_dialer *d = arg;
 	return (nni_stream_dialer_get_tls(d->dialer, tls));
 }
 
-static int
+static nng_err
 wstran_dialer_set_tls(void *arg, nng_tls_config *tls)
 {
 	ws_dialer *d = arg;
 	return (nni_stream_dialer_set_tls(d->dialer, tls));
 }
 
-static int
+static nng_err
 wstran_listener_get(
     void *arg, const char *name, void *buf, size_t *szp, nni_type t)
 {
@@ -638,12 +638,12 @@ wstran_listener_get(
 	return (rv);
 }
 
-static int
+static nng_err
 wstran_listener_set(
     void *arg, const char *name, const void *buf, size_t sz, nni_type t)
 {
 	ws_listener *l = arg;
-	int          rv;
+	nng_err      rv;
 
 	rv = nni_stream_listener_set(l->listener, name, buf, sz, t);
 	if (rv == NNG_ENOTSUP) {
@@ -652,14 +652,14 @@ wstran_listener_set(
 	return (rv);
 }
 
-static int
+static nng_err
 wstran_listener_get_tls(void *arg, nng_tls_config **tls)
 {
 	ws_listener *l = arg;
 	return (nni_stream_listener_get_tls(l->listener, tls));
 }
 
-static int
+static nng_err
 wstran_listener_set_tls(void *arg, nng_tls_config *tls)
 {
 	ws_listener *l = arg;