More symbol renaming

7 files changed, 61 insertions, 61 deletions

diff --git a/src/sp/transport.c b/src/sp/transport.c
index 2dce661c..f8751f68 100644
--- a/src/sp/transport.c
+++ b/src/sp/transport.c
@@ -1,5 +1,5 @@
 //
-// Copyright 2019 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2021 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2018 Capitar IT Group BV <info@capitar.com>
 // Copyright 2019 Devolutions <info@devolutions.net>
 //
@@ -38,26 +38,26 @@
 extern nni_sp_tran nni_tcp_tran;
 extern nni_sp_tran nni_ipc_tran;
 
-typedef struct nni_transport {
+typedef struct nni_sp_transport {
 	nni_sp_tran   t_tran;
 	nni_list_node t_node;
-} nni_transport;
+} nni_sp_transport;
 
-static nni_list nni_tran_list;
-static nni_mtx  nni_tran_lk;
-static int      nni_tran_inited;
+static nni_list nni_sp_tran_list;
+static nni_mtx  nni_sp_tran_lk;
+static int      nni_sp_tran_inited;
 
 int
-nni_tran_register(const nni_sp_tran *tran)
+nni_sp_tran_register(const nni_sp_tran *tran)
 {
-	nni_transport *t;
-	int            rv;
+	nni_sp_transport *t;
+	int               rv;
 
 	// Its entirely possible that we are called before any sockets
 	// are opened.  Make sure we are initialized.  This has to be
 	// protected by a guard to prevent infinite recursion, since
 	// nni_init also winds up calling us.
-	if (!nni_tran_inited) {
+	if (!nni_sp_tran_inited) {
 		nni_init();
 	}
 
@@ -65,60 +65,60 @@ nni_tran_register(const nni_sp_tran *tran)
 		return (NNG_ENOTSUP);
 	}
 
-	nni_mtx_lock(&nni_tran_lk);
+	nni_mtx_lock(&nni_sp_tran_lk);
 	// Check to see if the transport is already registered...
-	NNI_LIST_FOREACH (&nni_tran_list, t) {
+	NNI_LIST_FOREACH (&nni_sp_tran_list, t) {
 		if (strcmp(tran->tran_scheme, t->t_tran.tran_scheme) == 0) {
 			if (tran->tran_init == t->t_tran.tran_init) {
 				// duplicate.
-				nni_mtx_unlock(&nni_tran_lk);
+				nni_mtx_unlock(&nni_sp_tran_lk);
 				return (0);
 			}
-			nni_mtx_unlock(&nni_tran_lk);
+			nni_mtx_unlock(&nni_sp_tran_lk);
 			return (NNG_ESTATE);
 		}
 	}
 	if ((t = NNI_ALLOC_STRUCT(t)) == NULL) {
-		nni_mtx_unlock(&nni_tran_lk);
+		nni_mtx_unlock(&nni_sp_tran_lk);
 		return (NNG_ENOMEM);
 	}
 
 	t->t_tran = *tran;
 	if ((rv = t->t_tran.tran_init()) != 0) {
-		nni_mtx_unlock(&nni_tran_lk);
+		nni_mtx_unlock(&nni_sp_tran_lk);
 		NNI_FREE_STRUCT(t);
 		return (rv);
 	}
-	nni_list_append(&nni_tran_list, t);
-	nni_mtx_unlock(&nni_tran_lk);
+	nni_list_append(&nni_sp_tran_list, t);
+	nni_mtx_unlock(&nni_sp_tran_lk);
 	return (0);
 }
 
 nni_sp_tran *
-nni_tran_find(nni_url *url)
+nni_sp_tran_find(nni_url *url)
 {
 	// address is of the form "<scheme>://blah..."
-	nni_transport *t;
+	nni_sp_transport *t;
 
-	nni_mtx_lock(&nni_tran_lk);
-	NNI_LIST_FOREACH (&nni_tran_list, t) {
+	nni_mtx_lock(&nni_sp_tran_lk);
+	NNI_LIST_FOREACH (&nni_sp_tran_list, t) {
 		if (strcmp(url->u_scheme, t->t_tran.tran_scheme) == 0) {
-			nni_mtx_unlock(&nni_tran_lk);
+			nni_mtx_unlock(&nni_sp_tran_lk);
 			return (&t->t_tran);
 		}
 	}
-	nni_mtx_unlock(&nni_tran_lk);
+	nni_mtx_unlock(&nni_sp_tran_lk);
 	return (NULL);
 }
 
-// nni_tran_sys_init initializes the entire transport subsystem, including
+// nni_sp_tran_sys_init initializes the entire transport subsystem, including
 // each individual transport.
 
-typedef int (*nni_tran_ctor)(void);
+typedef int (*nni_sp_tran_ctor)(void);
 
 // These are just the statically compiled in constructors.
 // In the future we might want to support dynamic additions.
-static nni_tran_ctor nni_tran_ctors[] = {
+static nni_sp_tran_ctor nni_sp_tran_ctors[] = {
 #ifdef NNG_TRANSPORT_INPROC
 	nng_inproc_register,
 #endif
@@ -144,36 +144,36 @@ static nni_tran_ctor nni_tran_ctors[] = {
 };
 
 int
-nni_tran_sys_init(void)
+nni_sp_tran_sys_init(void)
 {
 	int i;
 
-	nni_tran_inited = 1;
-	NNI_LIST_INIT(&nni_tran_list, nni_transport, t_node);
-	nni_mtx_init(&nni_tran_lk);
+	nni_sp_tran_inited = 1;
+	NNI_LIST_INIT(&nni_sp_tran_list, nni_sp_transport, t_node);
+	nni_mtx_init(&nni_sp_tran_lk);
 
-	for (i = 0; nni_tran_ctors[i] != NULL; i++) {
+	for (i = 0; nni_sp_tran_ctors[i] != NULL; i++) {
 		int rv;
-		if ((rv = (nni_tran_ctors[i])()) != 0) {
-			nni_tran_sys_fini();
+		if ((rv = (nni_sp_tran_ctors[i]) ()) != 0) {
+			nni_sp_tran_sys_fini();
 			return (rv);
 		}
 	}
 	return (0);
 }
 
-// nni_tran_sys_fini finalizes the entire transport system, including all
+// nni_sp_tran_sys_fini finalizes the entire transport system, including all
 // transports.
 void
-nni_tran_sys_fini(void)
+nni_sp_tran_sys_fini(void)
 {
-	nni_transport *t;
+	nni_sp_transport *t;
 
-	while ((t = nni_list_first(&nni_tran_list)) != NULL) {
-		nni_list_remove(&nni_tran_list, t);
+	while ((t = nni_list_first(&nni_sp_tran_list)) != NULL) {
+		nni_list_remove(&nni_sp_tran_list, t);
 		t->t_tran.tran_fini();
 		NNI_FREE_STRUCT(t);
 	}
-	nni_mtx_fini(&nni_tran_lk);
-	nni_tran_inited = 0;
+	nni_mtx_fini(&nni_sp_tran_lk);
+	nni_sp_tran_inited = 0;
 }
diff --git a/src/sp/transport.h b/src/sp/transport.h
index d28053b9..dfa1509f 100644
--- a/src/sp/transport.h
+++ b/src/sp/transport.h
@@ -181,9 +181,9 @@ struct nni_sp_tran {
 
 // These APIs are used by the framework internally, and not for use by
 // transport implementations.
-extern nni_sp_tran *nni_tran_find(nni_url *);
-extern int       nni_tran_sys_init(void);
-extern void      nni_tran_sys_fini(void);
-extern int       nni_tran_register(const nni_sp_tran *);
+extern nni_sp_tran *nni_sp_tran_find(nni_url *url);
+extern int          nni_sp_tran_sys_init(void);
+extern void         nni_sp_tran_sys_fini(void);
+extern int          nni_sp_tran_register(const nni_sp_tran *tran);
 
 #endif // CORE_TRANSPORT_H
diff --git a/src/sp/transport/inproc/inproc.c b/src/sp/transport/inproc/inproc.c
index 1a666922..e9ac2e42 100644
--- a/src/sp/transport/inproc/inproc.c
+++ b/src/sp/transport/inproc/inproc.c
@@ -688,5 +688,5 @@ struct nni_sp_tran nni_inproc_tran = {
 int
 nng_inproc_register(void)
 {
-	return (nni_tran_register(&nni_inproc_tran));
+	return (nni_sp_tran_register(&nni_inproc_tran));
 }
diff --git a/src/sp/transport/ipc/ipc.c b/src/sp/transport/ipc/ipc.c
index d6b473ec..ef597c5d 100644
--- a/src/sp/transport/ipc/ipc.c
+++ b/src/sp/transport/ipc/ipc.c
@@ -1156,12 +1156,12 @@ int
 nng_ipc_register(void)
 {
 	int rv;
-	if (((rv = nni_tran_register(&ipc_tran)) != 0)
+	if (((rv = nni_sp_tran_register(&ipc_tran)) != 0)
 #ifdef NNG_PLATFORM_POSIX
-	    || ((rv = nni_tran_register(&ipc_tran_unix)) != 0)
+	    || ((rv = nni_sp_tran_register(&ipc_tran_unix)) != 0)
 #endif
 #ifdef NNG_HAVE_ABSTRACT_SOCKETS
-	    || ((rv = nni_tran_register(&ipc_tran_abstract)) != 0)
+	    || ((rv = nni_sp_tran_register(&ipc_tran_abstract)) != 0)
 #endif
 	) {
 		return (rv);
diff --git a/src/sp/transport/tcp/tcp.c b/src/sp/transport/tcp/tcp.c
index 60208080..0928929a 100644
--- a/src/sp/transport/tcp/tcp.c
+++ b/src/sp/transport/tcp/tcp.c
@@ -1255,9 +1255,9 @@ int
 nng_tcp_register(void)
 {
 	int rv;
-	if (((rv = nni_tran_register(&tcp_tran)) != 0) ||
-	    ((rv = nni_tran_register(&tcp4_tran)) != 0) ||
-	    ((rv = nni_tran_register(&tcp6_tran)) != 0)) {
+	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);
 	}
 	return (0);
diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c
index 87df05b0..429440dc 100644
--- a/src/sp/transport/tls/tls.c
+++ b/src/sp/transport/tls/tls.c
@@ -1284,9 +1284,9 @@ int
 nng_tls_register(void)
 {
 	int rv;
-	if (((rv = nni_tran_register(&tls_tran)) != 0) ||
-	    ((rv = nni_tran_register(&tls4_tran)) != 0) ||
-	    ((rv = nni_tran_register(&tls6_tran)) != 0)) {
+	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);
 	}
 	return (0);
diff --git a/src/sp/transport/ws/websocket.c b/src/sp/transport/ws/websocket.c
index fcdd359f..63a54ce2 100644
--- a/src/sp/transport/ws/websocket.c
+++ b/src/sp/transport/ws/websocket.c
@@ -675,9 +675,9 @@ int
 nng_ws_register(void)
 {
 	int rv;
-	if (((rv = nni_tran_register(&ws_tran)) != 0) ||
-	    ((rv = nni_tran_register(&ws4_tran)) != 0) ||
-	    ((rv = nni_tran_register(&ws6_tran)) != 0)) {
+	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);
 	}
 
@@ -720,9 +720,9 @@ int
 nng_wss_register(void)
 {
 	int rv;
-	if (((rv = nni_tran_register(&wss_tran)) != 0) ||
-	    ((rv = nni_tran_register(&wss4_tran)) != 0) ||
-	    ((rv = nni_tran_register(&wss6_tran)) != 0)) {
+	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);
 	}