diff options
| author | Garrett D'Amore <garrett@damore.org> | 2017-01-02 12:08:44 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2017-01-02 12:08:44 -0800 |
| commit | 546c0d6ecc4267b9178f6eecb134e45c16b839cf (patch) | |
| tree | 230b95a73300b4df32d352f01d6e7841875f3c1b /src/protocol/reqrep/req.c | |
| parent | 9eb080db1c450228169cc58f14d946211378fcf7 (diff) | |
| download | nng-546c0d6ecc4267b9178f6eecb134e45c16b839cf.tar.gz nng-546c0d6ecc4267b9178f6eecb134e45c16b839cf.tar.bz2 nng-546c0d6ecc4267b9178f6eecb134e45c16b839cf.zip | |
Rename nni_socket to nni_sock.
Diffstat (limited to 'src/protocol/reqrep/req.c')
| -rw-r--r-- | src/protocol/reqrep/req.c | 14 |
1 files changed, 7 insertions, 7 deletions
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); |