fixes #831 Unify option structures, o_type is unused

4 files changed, 5 insertions, 15 deletions

diff --git a/src/protocol/reqrep0/rep.c b/src/protocol/reqrep0/rep.c
index 875918f5..5f856f8e 100644
--- a/src/protocol/reqrep0/rep.c
+++ b/src/protocol/reqrep0/rep.c
@@ -679,21 +679,18 @@ static nni_proto_ctx_ops rep0_ctx_ops = {
 	.ctx_recv = rep0_ctx_recv,
 };
 
-static nni_proto_option rep0_sock_options[] = {
+static nni_option rep0_sock_options[] = {
 	{
 	    .o_name = NNG_OPT_MAXTTL,
-	    .o_type = NNI_TYPE_INT32,
 	    .o_get  = rep0_sock_get_maxttl,
 	    .o_set  = rep0_sock_set_maxttl,
 	},
 	{
 	    .o_name = NNG_OPT_RECVFD,
-	    .o_type = NNI_TYPE_INT32,
 	    .o_get  = rep0_sock_get_recvfd,
 	},
 	{
 	    .o_name = NNG_OPT_SENDFD,
-	    .o_type = NNI_TYPE_INT32,
 	    .o_get  = rep0_sock_get_sendfd,
 	},
 	// terminate list
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
diff --git a/src/protocol/reqrep0/xrep.c b/src/protocol/reqrep0/xrep.c
index d89722d6..09c11cda 100644
--- a/src/protocol/reqrep0/xrep.c
+++ b/src/protocol/reqrep0/xrep.c
@@ -408,10 +408,9 @@ static nni_proto_pipe_ops xrep0_pipe_ops = {
 	.pipe_stop  = xrep0_pipe_stop,
 };
 
-static nni_proto_option xrep0_sock_options[] = {
+static nni_option xrep0_sock_options[] = {
 	{
 	    .o_name = NNG_OPT_MAXTTL,
-	    .o_type = NNI_TYPE_INT32,
 	    .o_get  = xrep0_sock_get_maxttl,
 	    .o_set  = xrep0_sock_set_maxttl,
 	},
diff --git a/src/protocol/reqrep0/xreq.c b/src/protocol/reqrep0/xreq.c
index 271c59a6..119b2449 100644
--- a/src/protocol/reqrep0/xreq.c
+++ b/src/protocol/reqrep0/xreq.c
@@ -289,10 +289,9 @@ static nni_proto_pipe_ops xreq0_pipe_ops = {
 	.pipe_stop  = xreq0_pipe_stop,
 };
 
-static nni_proto_option xreq0_sock_options[] = {
+static nni_option xreq0_sock_options[] = {
 	{
 	    .o_name = NNG_OPT_MAXTTL,
-	    .o_type = NNI_TYPE_INT32,
 	    .o_get  = xreq0_sock_get_maxttl,
 	    .o_set  = xreq0_sock_set_maxttl,
 	},