fixes #831 Unify option structures, o_type is unused

4 files changed, 5 insertions, 15 deletions

diff --git a/src/protocol/survey0/respond.c b/src/protocol/survey0/respond.c
index 593b9bae..caecf719 100644
--- a/src/protocol/survey0/respond.c
+++ b/src/protocol/survey0/respond.c
@@ -656,22 +656,19 @@ static nni_proto_ctx_ops resp0_ctx_ops = {
 	.ctx_recv = resp0_ctx_recv,
 };
 
-static nni_proto_option resp0_sock_options[] = {
+static nni_option resp0_sock_options[] = {
 	{
 	    .o_name = NNG_OPT_MAXTTL,
-	    .o_type = NNI_TYPE_INT32,
 	    .o_get  = resp0_sock_get_maxttl,
 	    .o_set  = resp0_sock_set_maxttl,
 	},
 	{
 	    .o_name = NNG_OPT_RECVFD,
-	    .o_type = NNI_TYPE_INT32,
 	    .o_get  = resp0_sock_get_recvfd,
 	    .o_set  = NULL,
 	},
 	{
 	    .o_name = NNG_OPT_SENDFD,
-	    .o_type = NNI_TYPE_INT32,
 	    .o_get  = resp0_sock_get_sendfd,
 	    .o_set  = NULL,
 	},
diff --git a/src/protocol/survey0/survey.c b/src/protocol/survey0/survey.c
index a2eb7379..3ecc1457 100644
--- a/src/protocol/survey0/survey.c
+++ b/src/protocol/survey0/survey.c
@@ -551,10 +551,9 @@ static nni_proto_pipe_ops surv0_pipe_ops = {
 	.pipe_stop  = surv0_pipe_stop,
 };
 
-static nni_proto_option surv0_ctx_options[] = {
+static nni_option surv0_ctx_options[] = {
 	{
 	    .o_name = NNG_OPT_SURVEYOR_SURVEYTIME,
-	    .o_type = NNI_TYPE_DURATION,
 	    .o_get  = surv0_ctx_get_surveytime,
 	    .o_set  = surv0_ctx_set_surveytime,
 	},
@@ -570,27 +569,23 @@ static nni_proto_ctx_ops surv0_ctx_ops = {
 	.ctx_options = surv0_ctx_options,
 };
 
-static nni_proto_option surv0_sock_options[] = {
+static nni_option surv0_sock_options[] = {
 	{
 	    .o_name = NNG_OPT_SURVEYOR_SURVEYTIME,
-	    .o_type = NNI_TYPE_DURATION,
 	    .o_get  = surv0_sock_get_surveytime,
 	    .o_set  = surv0_sock_set_surveytime,
 	},
 	{
 	    .o_name = NNG_OPT_MAXTTL,
-	    .o_type = NNI_TYPE_INT32,
 	    .o_get  = surv0_sock_get_maxttl,
 	    .o_set  = surv0_sock_set_maxttl,
 	},
 	{
 	    .o_name = NNG_OPT_RECVFD,
-	    .o_type = NNI_TYPE_INT32,
 	    .o_get  = surv0_sock_get_recvfd,
 	},
 	{
 	    .o_name = NNG_OPT_SENDFD,
-	    .o_type = NNI_TYPE_INT32,
 	    .o_get  = surv0_sock_get_sendfd,
 	},
 	// terminate list
diff --git a/src/protocol/survey0/xrespond.c b/src/protocol/survey0/xrespond.c
index 9c9a1a16..865a94f3 100644
--- a/src/protocol/survey0/xrespond.c
+++ b/src/protocol/survey0/xrespond.c
@@ -385,10 +385,9 @@ static nni_proto_pipe_ops xresp0_pipe_ops = {
 	.pipe_stop  = xresp0_pipe_stop,
 };
 
-static nni_proto_option xresp0_sock_options[] = {
+static nni_option xresp0_sock_options[] = {
 	{
 	    .o_name = NNG_OPT_MAXTTL,
-	    .o_type = NNI_TYPE_INT32,
 	    .o_get  = xresp0_sock_get_maxttl,
 	    .o_set  = xresp0_sock_set_maxttl,
 	},
diff --git a/src/protocol/survey0/xsurvey.c b/src/protocol/survey0/xsurvey.c
index 83a7c589..9cf5af1f 100644
--- a/src/protocol/survey0/xsurvey.c
+++ b/src/protocol/survey0/xsurvey.c
@@ -356,10 +356,9 @@ static nni_proto_pipe_ops xsurv0_pipe_ops = {
 	.pipe_stop  = xsurv0_pipe_stop,
 };
 
-static nni_proto_option xsurv0_sock_options[] = {
+static nni_option xsurv0_sock_options[] = {
 	{
 	    .o_name = NNG_OPT_MAXTTL,
-	    .o_type = NNI_TYPE_INT32,
 	    .o_get  = xsurv0_sock_get_maxttl,
 	    .o_set  = xsurv0_sock_set_maxttl,
 	},