Merge internal and external URL APIs. No need for

the separation of nni_url and nng_url.

3 files changed, 7 insertions, 7 deletions

diff --git a/src/sp/transport/inproc/inproc.c b/src/sp/transport/inproc/inproc.c
index b7ead07c..b759ccc0 100644
--- a/src/sp/transport/inproc/inproc.c
+++ b/src/sp/transport/inproc/inproc.c
@@ -283,7 +283,7 @@ inproc_pipe_get_addr(void *arg, void *buf, size_t *szp, nni_opt_type t)
 }
 
 static int
-inproc_dialer_init(void **epp, nni_url *url, nni_dialer *ndialer)
+inproc_dialer_init(void **epp, nng_url *url, nni_dialer *ndialer)
 {
 	inproc_ep *ep;
 	nni_sock  *sock = nni_dialer_sock(ndialer);
@@ -306,7 +306,7 @@ inproc_dialer_init(void **epp, nni_url *url, nni_dialer *ndialer)
 }
 
 static int
-inproc_listener_init(void **epp, nni_url *url, nni_listener *nlistener)
+inproc_listener_init(void **epp, nng_url *url, nni_listener *nlistener)
 {
 	inproc_ep *ep;
 	nni_sock  *sock = nni_listener_sock(nlistener);
diff --git a/src/sp/transport/ipc/ipc.c b/src/sp/transport/ipc/ipc.c
index 82af6925..aefd82ce 100644
--- a/src/sp/transport/ipc/ipc.c
+++ b/src/sp/transport/ipc/ipc.c
@@ -851,7 +851,7 @@ ipc_ep_init(ipc_ep **epp, nni_sock *sock)
 }
 
 static int
-ipc_ep_init_dialer(void **dp, nni_url *url, nni_dialer *dialer)
+ipc_ep_init_dialer(void **dp, nng_url *url, nni_dialer *dialer)
 {
 	ipc_ep   *ep;
 	int       rv;
@@ -874,7 +874,7 @@ ipc_ep_init_dialer(void **dp, nni_url *url, nni_dialer *dialer)
 }
 
 static int
-ipc_ep_init_listener(void **dp, nni_url *url, nni_listener *listener)
+ipc_ep_init_listener(void **dp, nng_url *url, nni_listener *listener)
 {
 	ipc_ep   *ep;
 	int       rv;
diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c
index b1aea7b3..394eb561 100644
--- a/src/sp/transport/tls/tls.c
+++ b/src/sp/transport/tls/tls.c
@@ -61,7 +61,7 @@ struct tlstran_ep {
 	bool                 closed;
 	bool                 fini;
 	int                  refcnt;
-	nni_url             *url;
+	nng_url             *url;
 	nni_list             pipes;
 	nni_reap_node        reap;
 	nng_stream_dialer   *dialer;
@@ -825,7 +825,7 @@ tlstran_ep_init(tlstran_ep **epp, nng_url *url, nni_sock *sock)
 }
 
 static int
-tlstran_ep_init_dialer(void **dp, nni_url *url, nni_dialer *ndialer)
+tlstran_ep_init_dialer(void **dp, nng_url *url, nni_dialer *ndialer)
 {
 	tlstran_ep *ep;
 	int         rv;
@@ -859,7 +859,7 @@ tlstran_ep_init_dialer(void **dp, nni_url *url, nni_dialer *ndialer)
 }
 
 static int
-tlstran_ep_init_listener(void **lp, nni_url *url, nni_listener *nlistener)
+tlstran_ep_init_listener(void **lp, nng_url *url, nni_listener *nlistener)
 {
 	tlstran_ep *ep;
 	int         rv;