From fb7f83b4c6f371372f742ff45f5efb8e83374f8c Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sun, 3 Nov 2024 08:57:35 -0800 Subject: Remove nng_ctx untyped option functions --- src/nng.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/nng.c b/src/nng.c index 8fafe364..5ea21d21 100644 --- a/src/nng.c +++ b/src/nng.c @@ -410,10 +410,8 @@ ctx_get(nng_ctx id, const char *n, void *v, size_t *szp, nni_type t) nni_ctx *ctx; int rv; - if ((rv = nni_init()) != 0) { - return (rv); - } - if ((rv = nni_ctx_find(&ctx, id.id, false)) != 0) { + if (((rv = nni_init()) != 0) || + ((rv = nni_ctx_find(&ctx, id.id, false)) != 0)) { return (rv); } rv = nni_ctx_getopt(ctx, n, v, szp, t); @@ -421,12 +419,6 @@ ctx_get(nng_ctx id, const char *n, void *v, size_t *szp, nni_type t) return (rv); } -int -nng_ctx_get(nng_ctx id, const char *n, void *v, size_t *szp) -{ - return (ctx_get(id, n, v, szp, NNI_TYPE_OPAQUE)); -} - int nng_ctx_get_int(nng_ctx id, const char *n, int *v) { @@ -475,10 +467,8 @@ ctx_set(nng_ctx id, const char *n, const void *v, size_t sz, nni_type t) nni_ctx *ctx; int rv; - if ((rv = nni_init()) != 0) { - return (rv); - } - if ((rv = nni_ctx_find(&ctx, id.id, false)) != 0) { + if (((rv = nni_init()) != 0) || + ((rv = nni_ctx_find(&ctx, id.id, false)) != 0)) { return (rv); } rv = nni_ctx_setopt(ctx, n, v, sz, t); @@ -486,12 +476,6 @@ ctx_set(nng_ctx id, const char *n, const void *v, size_t sz, nni_type t) return (rv); } -int -nng_ctx_set(nng_ctx id, const char *n, const void *v, size_t sz) -{ - return (ctx_set(id, n, v, sz, NNI_TYPE_OPAQUE)); -} - int nng_ctx_set_int(nng_ctx id, const char *n, int v) { -- cgit v1.2.3-70-g09d2