diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-12-28 21:07:58 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-12-29 14:22:06 -0800 |
| commit | d3bd35ab49ad74528fd9e34cce9016d74dd91943 (patch) | |
| tree | 596459970f49a340f5e292f7bdb4060f4ea2be81 /src/protocol/reqrep0/req.c | |
| parent | 02e90dd4f29037e43f28e3bd1e912d4092011d23 (diff) | |
| download | nng-d3bd35ab49ad74528fd9e34cce9016d74dd91943.tar.gz nng-d3bd35ab49ad74528fd9e34cce9016d74dd91943.tar.bz2 nng-d3bd35ab49ad74528fd9e34cce9016d74dd91943.zip | |
fixes #831 Unify option structures, o_type is unused
Diffstat (limited to 'src/protocol/reqrep0/req.c')
| -rw-r--r-- | src/protocol/reqrep0/req.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/protocol/reqrep0/req.c b/src/protocol/reqrep0/req.c index 139427a2..69ef27f2 100644 --- a/src/protocol/reqrep0/req.c +++ b/src/protocol/reqrep0/req.c @@ -851,10 +851,9 @@ static nni_proto_pipe_ops req0_pipe_ops = { .pipe_stop = req0_pipe_stop, }; -static nni_proto_option req0_ctx_options[] = { +static nni_option req0_ctx_options[] = { { .o_name = NNG_OPT_REQ_RESENDTIME, - .o_type = NNI_TYPE_DURATION, .o_get = req0_ctx_get_resendtime, .o_set = req0_ctx_set_resendtime, }, @@ -871,27 +870,23 @@ static nni_proto_ctx_ops req0_ctx_ops = { .ctx_options = req0_ctx_options, }; -static nni_proto_option req0_sock_options[] = { +static nni_option req0_sock_options[] = { { .o_name = NNG_OPT_MAXTTL, - .o_type = NNI_TYPE_INT32, .o_get = req0_sock_get_maxttl, .o_set = req0_sock_set_maxttl, }, { .o_name = NNG_OPT_REQ_RESENDTIME, - .o_type = NNI_TYPE_DURATION, .o_get = req0_sock_get_resendtime, .o_set = req0_sock_set_resendtime, }, { .o_name = NNG_OPT_RECVFD, - .o_type = NNI_TYPE_INT32, .o_get = req0_sock_get_recvfd, }, { .o_name = NNG_OPT_SENDFD, - .o_type = NNI_TYPE_INT32, .o_get = req0_sock_get_sendfd, }, // terminate list |