From 02ec0b55cbee5de4d0fd688ce0ebddf08178dc98 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sat, 2 Nov 2024 23:54:27 -0700 Subject: Replace `NNG_OPT_RAW` with `nng_socket_raw`. Similar to the other identities, this simplifies code a bit. --- src/sp/protocol/pubsub0/pub_test.c | 5 ++--- src/sp/protocol/pubsub0/sub_test.c | 2 +- src/sp/protocol/pubsub0/xsub_test.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/sp/protocol/pubsub0') diff --git a/src/sp/protocol/pubsub0/pub_test.c b/src/sp/protocol/pubsub0/pub_test.c index 5f0ef01e..733d6fb5 100644 --- a/src/sp/protocol/pubsub0/pub_test.c +++ b/src/sp/protocol/pubsub0/pub_test.c @@ -298,14 +298,13 @@ test_pub_cooked(void) bool b; NUTS_PASS(nng_pub0_open(&s)); - NUTS_PASS(nng_socket_get_bool(s, NNG_OPT_RAW, &b)); + NUTS_PASS(nng_socket_raw(s, &b)); NUTS_TRUE(!b); - NUTS_FAIL(nng_socket_set_bool(s, NNG_OPT_RAW, true), NNG_EREADONLY); NUTS_PASS(nng_close(s)); // raw pub only differs in the option setting NUTS_PASS(nng_pub0_open_raw(&s)); - NUTS_PASS(nng_socket_get_bool(s, NNG_OPT_RAW, &b)); + NUTS_PASS(nng_socket_raw(s, &b)); NUTS_TRUE(b); NUTS_CLOSE(s); } diff --git a/src/sp/protocol/pubsub0/sub_test.c b/src/sp/protocol/pubsub0/sub_test.c index b823d486..9802a35e 100644 --- a/src/sp/protocol/pubsub0/sub_test.c +++ b/src/sp/protocol/pubsub0/sub_test.c @@ -576,7 +576,7 @@ test_sub_cooked(void) bool b; NUTS_PASS(nng_sub0_open(&s)); - NUTS_PASS(nng_socket_get_bool(s, NNG_OPT_RAW, &b)); + NUTS_PASS(nng_socket_raw(s, &b)); NUTS_TRUE(!b); NUTS_CLOSE(s); } diff --git a/src/sp/protocol/pubsub0/xsub_test.c b/src/sp/protocol/pubsub0/xsub_test.c index 8e5568c4..eec73505 100644 --- a/src/sp/protocol/pubsub0/xsub_test.c +++ b/src/sp/protocol/pubsub0/xsub_test.c @@ -283,7 +283,7 @@ test_xsub_raw(void) bool b; NUTS_PASS(nng_sub0_open_raw(&s)); - NUTS_PASS(nng_socket_get_bool(s, NNG_OPT_RAW, &b)); + NUTS_PASS(nng_socket_raw(s, &b)); NUTS_TRUE(b); NUTS_CLOSE(s); } -- cgit v1.2.3-70-g09d2