diff options
| -rw-r--r-- | src/core/socket.c | 11 | ||||
| -rw-r--r-- | tests/convey.c | 1 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index f01379a8..240af252 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -418,11 +418,9 @@ nni_sock_sys_fini(void) int nni_sock_open(nni_sock **sockp, const nni_proto *proto) { - nni_sock * sock; - int rv; - nni_proto_sock_ops *sops; - nni_proto_pipe_ops *pops; - uint32_t sockid; + nni_sock *sock; + int rv; + uint32_t sockid; if (proto->proto_version != NNI_PROTOCOL_VERSION) { // unsupported protocol version @@ -445,7 +443,6 @@ nni_sock_open(nni_sock **sockp, const nni_proto *proto) sock->s_sock_ops = *proto->proto_sock_ops; sock->s_pipe_ops = *proto->proto_pipe_ops; - sops = &sock->s_sock_ops; NNI_ASSERT(sock->s_sock_ops.sock_open != NULL); NNI_ASSERT(sock->s_sock_ops.sock_close != NULL); @@ -457,7 +454,7 @@ nni_sock_open(nni_sock **sockp, const nni_proto *proto) return (rv); } - sops->sock_open(sock->s_data); + sock->s_sock_ops.sock_open(sock->s_data); nni_mtx_lock(&nni_sock_lk); nni_list_append(&nni_sock_list, sock); diff --git a/tests/convey.c b/tests/convey.c index 4260a65d..2d2b1f03 100644 --- a/tests/convey.c +++ b/tests/convey.c @@ -1098,6 +1098,7 @@ conveyMain(int argc, char **argv) break; } + convey_read_timer(&pc, &secs, &usecs); (void) printf("%-8s%-52s%4d.%03ds\n", status, prog, secs, usecs / 1000); while ((env = convey_environment) != NULL) { convey_environment = env->next; |