Simplify the SP transport initialization process.

6 files changed, 27 insertions, 64 deletions

diff --git a/src/sp/transport/inproc/inproc.c b/src/sp/transport/inproc/inproc.c
index e9ac2e42..a67d6d18 100644
--- a/src/sp/transport/inproc/inproc.c
+++ b/src/sp/transport/inproc/inproc.c
@@ -67,13 +67,12 @@ struct inproc_ep {
 // which we use for coordinating rendezvous.
 static inproc_global nni_inproc;
 
-static int
+static void
 inproc_init(void)
 {
 	NNI_LIST_INIT(&nni_inproc.servers, inproc_ep, node);
 
 	nni_mtx_init(&nni_inproc.mx);
-	return (0);
 }
 
 static void
@@ -676,7 +675,6 @@ static nni_sp_listener_ops inproc_listener_ops = {
 // This is the inproc transport linkage, and should be the only global
 // symbol in this entire file.
 struct nni_sp_tran nni_inproc_tran = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "inproc",
 	.tran_dialer   = &inproc_dialer_ops,
 	.tran_listener = &inproc_listener_ops,
@@ -688,5 +686,6 @@ struct nni_sp_tran nni_inproc_tran = {
 int
 nng_inproc_register(void)
 {
-	return (nni_sp_tran_register(&nni_inproc_tran));
+	nni_sp_tran_register(&nni_inproc_tran);
+	return (0);
 }
diff --git a/src/sp/transport/ipc/ipc.c b/src/sp/transport/ipc/ipc.c
index ef597c5d..502943a5 100644
--- a/src/sp/transport/ipc/ipc.c
+++ b/src/sp/transport/ipc/ipc.c
@@ -93,10 +93,9 @@ static nni_reap_list ipc_pipe_reap_list = {
 	.rl_func   = ipc_pipe_fini,
 };
 
-static int
+static void
 ipc_tran_init(void)
 {
-	return (0);
 }
 
 static void
@@ -1119,7 +1118,6 @@ static nni_sp_listener_ops ipc_listener_ops = {
 };
 
 static nni_sp_tran ipc_tran = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "ipc",
 	.tran_dialer   = &ipc_dialer_ops,
 	.tran_listener = &ipc_listener_ops,
@@ -1130,7 +1128,6 @@ static nni_sp_tran ipc_tran = {
 
 #ifdef NNG_PLATFORM_POSIX
 static nni_sp_tran ipc_tran_unix = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "unix",
 	.tran_dialer   = &ipc_dialer_ops,
 	.tran_listener = &ipc_listener_ops,
@@ -1142,7 +1139,6 @@ static nni_sp_tran ipc_tran_unix = {
 
 #ifdef NNG_HAVE_ABSTRACT_SOCKETS
 static nni_sp_tran ipc_tran_abstract = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "abstract",
 	.tran_dialer   = &ipc_dialer_ops,
 	.tran_listener = &ipc_listener_ops,
@@ -1155,17 +1151,13 @@ static nni_sp_tran ipc_tran_abstract = {
 int
 nng_ipc_register(void)
 {
-	int rv;
-	if (((rv = nni_sp_tran_register(&ipc_tran)) != 0)
+	nni_sp_tran_register(&ipc_tran);
 #ifdef NNG_PLATFORM_POSIX
-	    || ((rv = nni_sp_tran_register(&ipc_tran_unix)) != 0)
+	nni_sp_tran_register(&ipc_tran_unix);
 #endif
 #ifdef NNG_HAVE_ABSTRACT_SOCKETS
-	    || ((rv = nni_sp_tran_register(&ipc_tran_abstract)) != 0)
+	nni_sp_tran_register(&ipc_tran_abstract);
 #endif
-	) {
-		return (rv);
-	}
 
 	return (0);
 }
diff --git a/src/sp/transport/tcp/tcp.c b/src/sp/transport/tcp/tcp.c
index 0928929a..3aa20f38 100644
--- a/src/sp/transport/tcp/tcp.c
+++ b/src/sp/transport/tcp/tcp.c
@@ -92,10 +92,9 @@ static nni_reap_list tcptran_pipe_reap_list = {
 	.rl_func   = tcptran_pipe_fini,
 };
 
-static int
+static void
 tcptran_init(void)
 {
-	return (0);
 }
 
 static void
@@ -719,7 +718,7 @@ tcptran_url_parse_source(nng_url *url, nng_sockaddr *sa, const nng_url *surl)
 		return (0);
 	}
 
-	len             = (size_t)(semi - url->u_hostname);
+	len             = (size_t) (semi - url->u_hostname);
 	url->u_hostname = semi + 1;
 
 	if (strcmp(surl->u_scheme, "tcp") == 0) {
@@ -1222,7 +1221,6 @@ static nni_sp_listener_ops tcptran_listener_ops = {
 };
 
 static nni_sp_tran tcp_tran = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "tcp",
 	.tran_dialer   = &tcptran_dialer_ops,
 	.tran_listener = &tcptran_listener_ops,
@@ -1232,7 +1230,6 @@ static nni_sp_tran tcp_tran = {
 };
 
 static nni_sp_tran tcp4_tran = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "tcp4",
 	.tran_dialer   = &tcptran_dialer_ops,
 	.tran_listener = &tcptran_listener_ops,
@@ -1242,7 +1239,6 @@ static nni_sp_tran tcp4_tran = {
 };
 
 static nni_sp_tran tcp6_tran = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "tcp6",
 	.tran_dialer   = &tcptran_dialer_ops,
 	.tran_listener = &tcptran_listener_ops,
@@ -1254,11 +1250,8 @@ static nni_sp_tran tcp6_tran = {
 int
 nng_tcp_register(void)
 {
-	int rv;
-	if (((rv = nni_sp_tran_register(&tcp_tran)) != 0) ||
-	    ((rv = nni_sp_tran_register(&tcp4_tran)) != 0) ||
-	    ((rv = nni_sp_tran_register(&tcp6_tran)) != 0)) {
-		return (rv);
-	}
+	nni_sp_tran_register(&tcp_tran);
+	nni_sp_tran_register(&tcp4_tran);
+	nni_sp_tran_register(&tcp6_tran);
 	return (0);
 }
diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c
index 429440dc..91c0f1c9 100644
--- a/src/sp/transport/tls/tls.c
+++ b/src/sp/transport/tls/tls.c
@@ -99,10 +99,9 @@ static nni_reap_list tlstran_pipe_reap_list = {
 	.rl_func   = tlstran_pipe_fini,
 };
 
-static int
+static void
 tlstran_init(void)
 {
-	return (0);
 }
 
 static void
@@ -688,7 +687,7 @@ tlstran_url_parse_source(nni_url *url, nng_sockaddr *sa, const nni_url *surl)
 		return (0);
 	}
 
-	len             = (size_t)(semi - url->u_hostname);
+	len             = (size_t) (semi - url->u_hostname);
 	url->u_hostname = semi + 1;
 
 	if (strcmp(surl->u_scheme, "tls+tcp") == 0) {
@@ -1251,7 +1250,6 @@ static nni_sp_listener_ops tlstran_listener_ops = {
 };
 
 static nni_sp_tran tls_tran = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "tls+tcp",
 	.tran_dialer   = &tlstran_dialer_ops,
 	.tran_listener = &tlstran_listener_ops,
@@ -1261,7 +1259,6 @@ static nni_sp_tran tls_tran = {
 };
 
 static nni_sp_tran tls4_tran = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "tls+tcp4",
 	.tran_dialer   = &tlstran_dialer_ops,
 	.tran_listener = &tlstran_listener_ops,
@@ -1271,7 +1268,6 @@ static nni_sp_tran tls4_tran = {
 };
 
 static nni_sp_tran tls6_tran = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "tls+tcp6",
 	.tran_dialer   = &tlstran_dialer_ops,
 	.tran_listener = &tlstran_listener_ops,
@@ -1283,11 +1279,8 @@ static nni_sp_tran tls6_tran = {
 int
 nng_tls_register(void)
 {
-	int rv;
-	if (((rv = nni_sp_tran_register(&tls_tran)) != 0) ||
-	    ((rv = nni_sp_tran_register(&tls4_tran)) != 0) ||
-	    ((rv = nni_sp_tran_register(&tls6_tran)) != 0)) {
-		return (rv);
-	}
+	nni_sp_tran_register(&tls_tran);
+	nni_sp_tran_register(&tls4_tran);
+	nni_sp_tran_register(&tls6_tran);
 	return (0);
 }
diff --git a/src/sp/transport/ws/websocket.c b/src/sp/transport/ws/websocket.c
index 63a54ce2..a3f2cd26 100644
--- a/src/sp/transport/ws/websocket.c
+++ b/src/sp/transport/ws/websocket.c
@@ -548,10 +548,9 @@ wstran_listener_init(void **lp, nng_url *url, nni_listener *listener)
 	return (0);
 }
 
-static int
+static void
 wstran_init(void)
 {
-	return (0);
 }
 
 static void
@@ -642,7 +641,6 @@ static nni_sp_listener_ops ws_listener_ops = {
 };
 
 static nni_sp_tran ws_tran = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "ws",
 	.tran_dialer   = &ws_dialer_ops,
 	.tran_listener = &ws_listener_ops,
@@ -652,7 +650,6 @@ static nni_sp_tran ws_tran = {
 };
 
 static nni_sp_tran ws4_tran = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "ws4",
 	.tran_dialer   = &ws_dialer_ops,
 	.tran_listener = &ws_listener_ops,
@@ -662,7 +659,6 @@ static nni_sp_tran ws4_tran = {
 };
 
 static nni_sp_tran ws6_tran = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "ws6",
 	.tran_dialer   = &ws_dialer_ops,
 	.tran_listener = &ws_listener_ops,
@@ -674,12 +670,9 @@ static nni_sp_tran ws6_tran = {
 int
 nng_ws_register(void)
 {
-	int rv;
-	if (((rv = nni_sp_tran_register(&ws_tran)) != 0) ||
-	    ((rv = nni_sp_tran_register(&ws4_tran)) != 0) ||
-	    ((rv = nni_sp_tran_register(&ws6_tran)) != 0)) {
-		return (rv);
-	}
+	nni_sp_tran_register(&ws_tran);
+	nni_sp_tran_register(&ws4_tran);
+	nni_sp_tran_register(&ws6_tran);
 
 	return (0);
 }
@@ -687,7 +680,6 @@ nng_ws_register(void)
 #ifdef NNG_TRANSPORT_WSS
 
 static nni_sp_tran wss_tran = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "wss",
 	.tran_dialer   = &ws_dialer_ops,
 	.tran_listener = &ws_listener_ops,
@@ -697,7 +689,6 @@ static nni_sp_tran wss_tran = {
 };
 
 static nni_sp_tran wss4_tran = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "wss4",
 	.tran_dialer   = &ws_dialer_ops,
 	.tran_listener = &ws_listener_ops,
@@ -707,7 +698,6 @@ static nni_sp_tran wss4_tran = {
 };
 
 static nni_sp_tran wss6_tran = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "wss6",
 	.tran_dialer   = &ws_dialer_ops,
 	.tran_listener = &ws_listener_ops,
@@ -719,12 +709,9 @@ static nni_sp_tran wss6_tran = {
 int
 nng_wss_register(void)
 {
-	int rv;
-	if (((rv = nni_sp_tran_register(&wss_tran)) != 0) ||
-	    ((rv = nni_sp_tran_register(&wss4_tran)) != 0) ||
-	    ((rv = nni_sp_tran_register(&wss6_tran)) != 0)) {
-		return (rv);
-	}
+	nni_sp_tran_register(&wss_tran);
+	nni_sp_tran_register(&wss4_tran);
+	nni_sp_tran_register(&wss6_tran);
 
 	return (0);
 }
diff --git a/src/sp/transport/zerotier/zerotier.c b/src/sp/transport/zerotier/zerotier.c
index 4e752020..15c0fe9f 100644
--- a/src/sp/transport/zerotier/zerotier.c
+++ b/src/sp/transport/zerotier/zerotier.c
@@ -1579,12 +1579,11 @@ done:
 	return (0);
 }
 
-static int
+static void
 zt_tran_init(void)
 {
 	nni_mtx_init(&zt_lk);
 	NNI_LIST_INIT(&zt_nodes, zt_node, zn_link);
-	return (0);
 }
 
 static void
@@ -3233,7 +3232,6 @@ static nni_tran_listener_ops zt_listener_ops = {
 // This is the ZeroTier transport linkage, and should be the
 // only global symbol in this entire file.
 static struct nni_tran zt_tran = {
-	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "zt",
 	.tran_dialer   = &zt_dialer_ops,
 	.tran_listener = &zt_listener_ops,
@@ -3245,5 +3243,6 @@ static struct nni_tran zt_tran = {
 int
 nng_zt_register(void)
 {
-	return (nni_tran_register(&zt_tran));
+	nni_tran_register(&zt_tran);
+	return (0);
 }