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/core/transport.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/core/transport.c') diff --git a/src/core/transport.c b/src/core/transport.c index e27c349e..185ab779 100644 --- a/src/core/transport.c +++ b/src/core/transport.c @@ -120,7 +120,7 @@ nni_tran_chkopt(const char *name, const void *v, size_t sz, int typ) NNI_LIST_FOREACH (&nni_tran_list, t) { const nni_tran_dialer_ops * dops; const nni_tran_listener_ops *lops; - const nni_tran_option * o; + const nni_option * o; // Generally we look for endpoint options. We check both // dialers and listeners. @@ -133,9 +133,8 @@ nni_tran_chkopt(const char *name, const void *v, size_t sz, int typ) nni_mtx_unlock(&nni_tran_lk); return (NNG_EREADONLY); } - - rv = (o->o_chk != NULL) ? o->o_chk(v, sz, typ) : 0; nni_mtx_unlock(&nni_tran_lk); + rv = o->o_set(NULL, v, sz, typ); return (rv); } lops = t->t_tran.tran_listener; @@ -147,9 +146,8 @@ nni_tran_chkopt(const char *name, const void *v, size_t sz, int typ) nni_mtx_unlock(&nni_tran_lk); return (NNG_EREADONLY); } - - rv = (o->o_chk != NULL) ? o->o_chk(v, sz, typ) : 0; nni_mtx_unlock(&nni_tran_lk); + rv = o->o_set(NULL, v, sz, typ); return (rv); } } -- cgit v1.2.3-70-g09d2