From 97fb819ccfd0d4cb7f02d7fc521d9478ba050776 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Fri, 10 Mar 2017 21:02:57 -0800 Subject: Surveyor pattern callback-driven. --- src/protocol/reqrep/rep.c | 14 ++++++-------- src/protocol/reqrep/req.c | 8 +++----- 2 files changed, 9 insertions(+), 13 deletions(-) (limited to 'src/protocol/reqrep') diff --git a/src/protocol/reqrep/rep.c b/src/protocol/reqrep/rep.c index 751a851b..736e4099 100644 --- a/src/protocol/reqrep/rep.c +++ b/src/protocol/reqrep/rep.c @@ -159,14 +159,12 @@ nni_rep_pipe_fini(void *arg) { nni_rep_pipe *rp = arg; - if (rp != NULL) { - nni_msgq_fini(rp->sendq); - nni_aio_fini(&rp->aio_getq); - nni_aio_fini(&rp->aio_send); - nni_aio_fini(&rp->aio_recv); - nni_aio_fini(&rp->aio_putq); - NNI_FREE_STRUCT(rp); - } + nni_msgq_fini(rp->sendq); + nni_aio_fini(&rp->aio_getq); + nni_aio_fini(&rp->aio_send); + nni_aio_fini(&rp->aio_recv); + nni_aio_fini(&rp->aio_putq); + NNI_FREE_STRUCT(rp); } diff --git a/src/protocol/reqrep/req.c b/src/protocol/reqrep/req.c index 553ef0bf..f37913e6 100644 --- a/src/protocol/reqrep/req.c +++ b/src/protocol/reqrep/req.c @@ -110,12 +110,10 @@ nni_req_sock_fini(void *arg) { nni_req_sock *req = arg; - if (req != NULL) { - if (req->reqmsg != NULL) { - nni_msg_free(req->reqmsg); - } - NNI_FREE_STRUCT(req); + if (req->reqmsg != NULL) { + nni_msg_free(req->reqmsg); } + NNI_FREE_STRUCT(req); } -- cgit v1.2.3-70-g09d2