From 546c0d6ecc4267b9178f6eecb134e45c16b839cf Mon Sep 17 00:00:00 2001
From: Garrett D'Amore <garrett@damore.org>
Date: Mon, 2 Jan 2017 12:08:44 -0800
Subject: Rename nni_socket to nni_sock.

---
 src/protocol/pair/pair.c  |  8 ++++----
 src/protocol/reqrep/rep.c | 14 +++++++-------
 src/protocol/reqrep/req.c | 14 +++++++-------
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/protocol')

diff --git a/src/protocol/pair/pair.c b/src/protocol/pair/pair.c
index 642f2845..037d5f1e 100644
--- a/src/protocol/pair/pair.c
+++ b/src/protocol/pair/pair.c
@@ -21,7 +21,7 @@ typedef struct nni_pair_sock	nni_pair_sock;
 
 // An nni_pair_sock is our per-socket protocol private structure.
 struct nni_pair_sock {
-	nni_socket *	sock;
+	nni_sock *	sock;
 	nni_pair_pipe * pipe;
 	nni_mtx		mx;
 	nni_msgq *	uwq;
@@ -42,7 +42,7 @@ static void nni_pair_receiver(void *);
 static void nni_pair_sender(void *);
 
 static int
-nni_pair_create(void **pairp, nni_socket *sock)
+nni_pair_create(void **pairp, nni_sock *sock)
 {
 	nni_pair_sock *pair;
 	int rv;
@@ -56,8 +56,8 @@ nni_pair_create(void **pairp, nni_socket *sock)
 	}
 	pair->sock = sock;
 	pair->pipe = NULL;
-	pair->uwq = nni_socket_sendq(sock);
-	pair->urq = nni_socket_recvq(sock);
+	pair->uwq = nni_sock_sendq(sock);
+	pair->urq = nni_sock_recvq(sock);
 	*pairp = pair;
 	return (0);
 }
diff --git a/src/protocol/reqrep/rep.c b/src/protocol/reqrep/rep.c
index 9323428c..75f2af71 100644
--- a/src/protocol/reqrep/rep.c
+++ b/src/protocol/reqrep/rep.c
@@ -21,7 +21,7 @@ typedef struct nni_rep_sock	nni_rep_sock;
 
 // An nni_rep_sock is our per-socket protocol private structure.
 struct nni_rep_sock {
-	nni_socket *	sock;
+	nni_sock *	sock;
 	nni_mtx		mx;
 	nni_msgq *	uwq;
 	nni_msgq *	urq;
@@ -46,7 +46,7 @@ static void nni_rep_sender(void *);
 static void nni_rep_topsender(void *);
 
 static int
-nni_rep_create(void **repp, nni_socket *sock)
+nni_rep_create(void **repp, nni_sock *sock)
 {
 	nni_rep_sock *rep;
 	int rv;
@@ -69,8 +69,8 @@ nni_rep_create(void **repp, nni_socket *sock)
 		return (rv);
 	}
 
-	rep->uwq = nni_socket_sendq(sock);
-	rep->urq = nni_socket_recvq(sock);
+	rep->uwq = nni_sock_sendq(sock);
+	rep->urq = nni_sock_recvq(sock);
 
 	rv = nni_thr_init(&rep->sender, nni_rep_topsender, rep);
 	if (rv != 0) {
@@ -80,7 +80,7 @@ nni_rep_create(void **repp, nni_socket *sock)
 		return (rv);
 	}
 	*repp = rep;
-	nni_socket_senderr(sock, NNG_ESTATE);
+	nni_sock_senderr(sock, NNG_ESTATE);
 	nni_thr_run(&rep->sender);
 	return (0);
 }
@@ -360,7 +360,7 @@ nni_rep_sendfilter(void *arg, nni_msg *msg)
 	}
 
 	// Cannot send again until a receive is done...
-	nni_socket_senderr(rep->sock, NNG_ESTATE);
+	nni_sock_senderr(rep->sock, NNG_ESTATE);
 
 	// If we have a stored backtrace, append it to the header...
 	// if we don't have a backtrace, discard the message.
@@ -404,7 +404,7 @@ nni_rep_recvfilter(void *arg, nni_msg *msg)
 		return (msg);
 	}
 
-	nni_socket_senderr(rep->sock, 0);
+	nni_sock_senderr(rep->sock, 0);
 	header = nni_msg_header(msg, &len);
 	if (rep->btrace != NULL) {
 		nni_free(rep->btrace, rep->btrace_len);
diff --git a/src/protocol/reqrep/req.c b/src/protocol/reqrep/req.c
index 35df0e56..ba7d4f6b 100644
--- a/src/protocol/reqrep/req.c
+++ b/src/protocol/reqrep/req.c
@@ -21,7 +21,7 @@ typedef struct nni_req_sock	nni_req_sock;
 
 // An nni_req_sock is our per-socket protocol private structure.
 struct nni_req_sock {
-	nni_socket *	sock;
+	nni_sock *	sock;
 	nni_mtx		mx;
 	nni_cv		cv;
 	nni_msgq *	uwq;
@@ -50,7 +50,7 @@ static void nni_req_sender(void *);
 static void nni_req_resender(void *);
 
 static int
-nni_req_create(void **reqp, nni_socket *sock)
+nni_req_create(void **reqp, nni_sock *sock)
 {
 	nni_req_sock *req;
 	int rv;
@@ -76,10 +76,10 @@ nni_req_create(void **reqp, nni_socket *sock)
 	req->resend = NNI_TIME_ZERO;
 	NNI_LIST_INIT(&req->pipes, nni_req_pipe, node);
 
-	req->uwq = nni_socket_sendq(sock);
-	req->urq = nni_socket_recvq(sock);
+	req->uwq = nni_sock_sendq(sock);
+	req->urq = nni_sock_recvq(sock);
 	*reqp = req;
-	nni_socket_recverr(sock, NNG_ESTATE);
+	nni_sock_recverr(sock, NNG_ESTATE);
 	rv = nni_thr_init(&req->resender, nni_req_resender, req);
 	if (rv != 0) {
 		nni_cv_fini(&req->cv);
@@ -345,7 +345,7 @@ nni_req_sendfilter(void *arg, nni_msg *msg)
 	nni_cv_wake(&req->cv);
 
 	// Clear the error condition.
-	nni_socket_recverr(req->sock, 0);
+	nni_sock_recverr(req->sock, 0);
 	nni_mtx_unlock(&req->mx);
 
 	return (msg);
@@ -386,7 +386,7 @@ nni_req_recvfilter(void *arg, nni_msg *msg)
 		return (NULL);
 	}
 
-	nni_socket_recverr(req->sock, NNG_ESTATE);
+	nni_sock_recverr(req->sock, NNG_ESTATE);
 	nni_msg_free(req->reqmsg);
 	req->reqmsg = NULL;
 	nni_cv_wake(&req->cv);
-- 
cgit v1.2.3-70-g09d2