From d3bd35ab49ad74528fd9e34cce9016d74dd91943 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Fri, 28 Dec 2018 21:07:58 -0800 Subject: fixes #831 Unify option structures, o_type is unused --- src/protocol/pubsub0/pub.c | 2 +- src/protocol/pubsub0/sub.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/protocol/pubsub0') diff --git a/src/protocol/pubsub0/pub.c b/src/protocol/pubsub0/pub.c index e1c182e8..2567a5b6 100644 --- a/src/protocol/pubsub0/pub.c +++ b/src/protocol/pubsub0/pub.c @@ -304,7 +304,7 @@ static nni_proto_pipe_ops pub0_pipe_ops = { .pipe_stop = pub0_pipe_stop, }; -static nni_proto_option pub0_sock_options[] = { +static nni_option pub0_sock_options[] = { // terminate list { .o_name = NULL, diff --git a/src/protocol/pubsub0/sub.c b/src/protocol/pubsub0/sub.c index 7bb4485a..5240fc83 100644 --- a/src/protocol/pubsub0/sub.c +++ b/src/protocol/pubsub0/sub.c @@ -352,15 +352,13 @@ static nni_proto_pipe_ops sub0_pipe_ops = { .pipe_stop = sub0_pipe_stop, }; -static nni_proto_option sub0_sock_options[] = { +static nni_option sub0_sock_options[] = { { .o_name = NNG_OPT_SUB_SUBSCRIBE, - .o_type = NNI_TYPE_OPAQUE, .o_set = sub0_subscribe, }, { .o_name = NNG_OPT_SUB_UNSUBSCRIBE, - .o_type = NNI_TYPE_OPAQUE, .o_set = sub0_unsubscribe, }, // terminate list -- cgit v1.2.3-70-g09d2