From 11485d2723f22dc60e4cefea3ffb3fd8a378d931 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sun, 3 Nov 2024 09:46:54 -0800 Subject: Remove untyped nng_socket_get and nng_socket_set. --- src/sp/protocol/survey0/respond_test.c | 10 ---------- src/sp/protocol/survey0/survey_test.c | 13 ------------- src/sp/protocol/survey0/xrespond_test.c | 9 --------- src/sp/protocol/survey0/xsurvey_test.c | 10 ---------- 4 files changed, 42 deletions(-) (limited to 'src/sp/protocol/survey0') diff --git a/src/sp/protocol/survey0/respond_test.c b/src/sp/protocol/survey0/respond_test.c index 5e3dad34..15061cc2 100644 --- a/src/sp/protocol/survey0/respond_test.c +++ b/src/sp/protocol/survey0/respond_test.c @@ -464,7 +464,6 @@ test_resp_ttl_option(void) nng_socket resp; int v; bool b; - size_t sz; const char *opt = NNG_OPT_MAXTTL; NUTS_PASS(nng_respondent0_open(&resp)); @@ -477,15 +476,6 @@ test_resp_ttl_option(void) NUTS_PASS(nng_socket_set_int(resp, opt, 3)); NUTS_PASS(nng_socket_get_int(resp, opt, &v)); NUTS_TRUE(v == 3); - v = 0; - sz = sizeof(v); - NUTS_PASS(nng_socket_get(resp, opt, &v, &sz)); - NUTS_TRUE(v == 3); - NUTS_TRUE(sz == sizeof(v)); - - NUTS_FAIL(nng_socket_set(resp, opt, "", 1), NNG_EINVAL); - sz = 1; - NUTS_FAIL(nng_socket_get(resp, opt, &v, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_bool(resp, opt, true), NNG_EBADTYPE); NUTS_FAIL(nng_socket_get_bool(resp, opt, &b), NNG_EBADTYPE); diff --git a/src/sp/protocol/survey0/survey_test.c b/src/sp/protocol/survey0/survey_test.c index e860dc14..6a5574c0 100644 --- a/src/sp/protocol/survey0/survey_test.c +++ b/src/sp/protocol/survey0/survey_test.c @@ -36,7 +36,6 @@ test_surv_ttl_option(void) nng_socket surv; int v; bool b; - size_t sz; const char *opt = NNG_OPT_MAXTTL; NUTS_PASS(nng_surveyor0_open(&surv)); @@ -51,15 +50,6 @@ test_surv_ttl_option(void) NUTS_PASS(nng_socket_set_int(surv, opt, 3)); NUTS_PASS(nng_socket_get_int(surv, opt, &v)); NUTS_TRUE(v == 3); - v = 0; - sz = sizeof(v); - NUTS_PASS(nng_socket_get(surv, opt, &v, &sz)); - NUTS_TRUE(v == 3); - NUTS_TRUE(sz == sizeof(v)); - - NUTS_FAIL(nng_socket_set(surv, opt, "", 1), NNG_EINVAL); - sz = 1; - NUTS_FAIL(nng_socket_get(surv, opt, &v, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_bool(surv, opt, true), NNG_EBADTYPE); NUTS_FAIL(nng_socket_get_bool(surv, opt, &b), NNG_EBADTYPE); @@ -72,14 +62,11 @@ test_surv_survey_time_option(void) nng_socket surv; nng_duration d; bool b; - size_t sz = sizeof(b); const char *opt = NNG_OPT_SURVEYOR_SURVEYTIME; NUTS_PASS(nng_surveyor0_open(&surv)); NUTS_PASS(nng_socket_set_ms(surv, opt, 10)); - NUTS_FAIL(nng_socket_set(surv, opt, "", 1), NNG_EINVAL); - NUTS_FAIL(nng_socket_get(surv, opt, &b, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_bool(surv, opt, true), NNG_EBADTYPE); NUTS_FAIL(nng_socket_get_bool(surv, opt, &b), NNG_EBADTYPE); diff --git a/src/sp/protocol/survey0/xrespond_test.c b/src/sp/protocol/survey0/xrespond_test.c index 2e4cd743..8106f161 100644 --- a/src/sp/protocol/survey0/xrespond_test.c +++ b/src/sp/protocol/survey0/xrespond_test.c @@ -321,7 +321,6 @@ test_xresp_ttl_option(void) nng_socket resp; int v; bool b; - size_t sz; const char *opt = NNG_OPT_MAXTTL; NUTS_PASS(nng_respondent0_open_raw(&resp)); @@ -334,15 +333,7 @@ test_xresp_ttl_option(void) NUTS_PASS(nng_socket_set_int(resp, opt, 3)); NUTS_PASS(nng_socket_get_int(resp, opt, &v)); NUTS_TRUE(v == 3); - v = 0; - sz = sizeof(v); - NUTS_PASS(nng_socket_get(resp, opt, &v, &sz)); - NUTS_TRUE(v == 3); - NUTS_TRUE(sz == sizeof(v)); - NUTS_FAIL(nng_socket_set(resp, opt, "", 1), NNG_EINVAL); - sz = 1; - NUTS_FAIL(nng_socket_get(resp, opt, &v, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_bool(resp, opt, true), NNG_EBADTYPE); NUTS_FAIL(nng_socket_get_bool(resp, opt, &b), NNG_EBADTYPE); diff --git a/src/sp/protocol/survey0/xsurvey_test.c b/src/sp/protocol/survey0/xsurvey_test.c index d55719af..e90939e9 100644 --- a/src/sp/protocol/survey0/xsurvey_test.c +++ b/src/sp/protocol/survey0/xsurvey_test.c @@ -320,7 +320,6 @@ test_xsurvey_ttl_option(void) nng_socket s; int v; bool b; - size_t sz; const char *opt = NNG_OPT_MAXTTL; NUTS_PASS(nng_surveyor0_open_raw(&s)); @@ -333,15 +332,6 @@ test_xsurvey_ttl_option(void) NUTS_PASS(nng_socket_set_int(s, opt, 3)); NUTS_PASS(nng_socket_get_int(s, opt, &v)); NUTS_TRUE(v == 3); - v = 0; - sz = sizeof(v); - NUTS_PASS(nng_socket_get(s, opt, &v, &sz)); - NUTS_TRUE(v == 3); - NUTS_TRUE(sz == sizeof(v)); - - NUTS_FAIL(nng_socket_set(s, opt, "", 1), NNG_EINVAL); - sz = 1; - NUTS_FAIL(nng_socket_get(s, opt, &v, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_bool(s, opt, true), NNG_EBADTYPE); NUTS_FAIL(nng_socket_get_bool(s, opt, &b), NNG_EBADTYPE); -- cgit v1.2.3-70-g09d2