diff options
Diffstat (limited to 'src/sp/protocol')
| -rw-r--r-- | src/sp/protocol/bus0/bus_test.c | 20 | ||||
| -rw-r--r-- | src/sp/protocol/pair0/pair0_test.c | 8 | ||||
| -rw-r--r-- | src/sp/protocol/pair1/pair1_poly_test.c | 2 | ||||
| -rw-r--r-- | src/sp/protocol/pair1/pair1_test.c | 9 | ||||
| -rw-r--r-- | src/sp/protocol/pipeline0/push_test.c | 4 | ||||
| -rw-r--r-- | src/sp/protocol/pubsub0/pub_test.c | 10 | ||||
| -rw-r--r-- | src/sp/protocol/pubsub0/sub_test.c | 18 | ||||
| -rw-r--r-- | src/sp/protocol/pubsub0/xsub_test.c | 10 | ||||
| -rw-r--r-- | src/sp/protocol/reqrep0/req_test.c | 16 | ||||
| -rw-r--r-- | src/sp/protocol/reqrep0/xrep_test.c | 10 | ||||
| -rw-r--r-- | src/sp/protocol/reqrep0/xreq_test.c | 9 | ||||
| -rw-r--r-- | src/sp/protocol/survey0/respond_test.c | 10 | ||||
| -rw-r--r-- | src/sp/protocol/survey0/survey_test.c | 13 | ||||
| -rw-r--r-- | src/sp/protocol/survey0/xrespond_test.c | 9 | ||||
| -rw-r--r-- | src/sp/protocol/survey0/xsurvey_test.c | 10 |
15 files changed, 0 insertions, 158 deletions
diff --git a/src/sp/protocol/bus0/bus_test.c b/src/sp/protocol/bus0/bus_test.c index 3fb2aa56..a6b04df9 100644 --- a/src/sp/protocol/bus0/bus_test.c +++ b/src/sp/protocol/bus0/bus_test.c @@ -300,7 +300,6 @@ test_bus_recv_buf_option(void) nng_socket s; int v; bool b; - size_t sz; const char *opt = NNG_OPT_RECVBUF; NUTS_PASS(nng_bus0_open(&s)); @@ -312,15 +311,6 @@ test_bus_recv_buf_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); @@ -334,7 +324,6 @@ test_bus_send_buf_option(void) nng_socket s2; int v; bool b; - size_t sz; const char *opt = NNG_OPT_SENDBUF; NUTS_PASS(nng_bus0_open(&s1)); @@ -348,15 +337,6 @@ test_bus_send_buf_option(void) NUTS_PASS(nng_socket_set_int(s1, opt, 3)); NUTS_PASS(nng_socket_get_int(s1, opt, &v)); NUTS_TRUE(v == 3); - v = 0; - sz = sizeof(v); - NUTS_PASS(nng_socket_get(s1, opt, &v, &sz)); - NUTS_TRUE(v == 3); - NUTS_TRUE(sz == sizeof(v)); - - NUTS_FAIL(nng_socket_set(s1, opt, "", 1), NNG_EINVAL); - sz = 1; - NUTS_FAIL(nng_socket_get(s1, opt, &v, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_bool(s1, opt, true), NNG_EBADTYPE); NUTS_FAIL(nng_socket_get_bool(s1, opt, &b), NNG_EBADTYPE); diff --git a/src/sp/protocol/pair0/pair0_test.c b/src/sp/protocol/pair0/pair0_test.c index c2bcb7ac..b01bdf91 100644 --- a/src/sp/protocol/pair0/pair0_test.c +++ b/src/sp/protocol/pair0/pair0_test.c @@ -282,19 +282,15 @@ test_pair0_send_buffer(void) nng_socket s; int v; bool b; - size_t sz; NUTS_PASS(nng_pair0_open(&s)); NUTS_PASS(nng_socket_get_int(s, NNG_OPT_SENDBUF, &v)); NUTS_TRUE(v == 0); NUTS_FAIL(nng_socket_get_bool(s, NNG_OPT_SENDBUF, &b), NNG_EBADTYPE); - sz = 1; - NUTS_FAIL(nng_socket_get(s, NNG_OPT_SENDBUF, &b, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_SENDBUF, -1), NNG_EINVAL); NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_SENDBUF, 100000), NNG_EINVAL); NUTS_FAIL( nng_socket_set_bool(s, NNG_OPT_SENDBUF, false), NNG_EBADTYPE); - NUTS_FAIL(nng_socket_set(s, NNG_OPT_SENDBUF, &b, 1), NNG_EINVAL); NUTS_PASS(nng_socket_set_int(s, NNG_OPT_SENDBUF, 100)); NUTS_PASS(nng_socket_get_int(s, NNG_OPT_SENDBUF, &v)); NUTS_TRUE(v == 100); @@ -307,19 +303,15 @@ test_pair0_recv_buffer(void) nng_socket s; int v; bool b; - size_t sz; NUTS_PASS(nng_pair0_open(&s)); NUTS_PASS(nng_socket_get_int(s, NNG_OPT_RECVBUF, &v)); NUTS_TRUE(v == 0); NUTS_FAIL(nng_socket_get_bool(s, NNG_OPT_RECVBUF, &b), NNG_EBADTYPE); - sz = 1; - NUTS_FAIL(nng_socket_get(s, NNG_OPT_RECVBUF, &b, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_RECVBUF, -1), NNG_EINVAL); NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_RECVBUF, 100000), NNG_EINVAL); NUTS_FAIL( nng_socket_set_bool(s, NNG_OPT_RECVBUF, false), NNG_EBADTYPE); - NUTS_FAIL(nng_socket_set(s, NNG_OPT_RECVBUF, &b, 1), NNG_EINVAL); NUTS_PASS(nng_socket_set_int(s, NNG_OPT_RECVBUF, 100)); NUTS_PASS(nng_socket_get_int(s, NNG_OPT_RECVBUF, &v)); NUTS_TRUE(v == 100); diff --git a/src/sp/protocol/pair1/pair1_poly_test.c b/src/sp/protocol/pair1/pair1_poly_test.c index acd7f44d..40e84d30 100644 --- a/src/sp/protocol/pair1/pair1_poly_test.c +++ b/src/sp/protocol/pair1/pair1_poly_test.c @@ -269,8 +269,6 @@ test_poly_ttl(void) // cannot set insane TTLs NUTS_FAIL(nng_socket_set_int(s1, NNG_OPT_MAXTTL, 0), NNG_EINVAL); NUTS_FAIL(nng_socket_set_int(s1, NNG_OPT_MAXTTL, 1000), NNG_EINVAL); - ttl = 8; - NUTS_FAIL(nng_socket_set(s1, NNG_OPT_MAXTTL, &ttl, 1), NNG_EINVAL); NUTS_FAIL(nng_socket_set_bool(s1, NNG_OPT_MAXTTL, true), NNG_EBADTYPE); NUTS_MARRY(s1, c1); diff --git a/src/sp/protocol/pair1/pair1_test.c b/src/sp/protocol/pair1/pair1_test.c index 8c6d433e..8d2ad940 100644 --- a/src/sp/protocol/pair1/pair1_test.c +++ b/src/sp/protocol/pair1/pair1_test.c @@ -319,7 +319,6 @@ test_pair1_ttl(void) NUTS_FAIL(nng_socket_set_int(s1, NNG_OPT_MAXTTL, 0), NNG_EINVAL); NUTS_FAIL(nng_socket_set_int(s1, NNG_OPT_MAXTTL, 1000), NNG_EINVAL); ttl = 8; - NUTS_FAIL(nng_socket_set(s1, NNG_OPT_MAXTTL, &ttl, 1), NNG_EINVAL); NUTS_FAIL(nng_socket_set_bool(s1, NNG_OPT_MAXTTL, true), NNG_EBADTYPE); NUTS_MARRY(s1, c1); @@ -466,19 +465,15 @@ test_pair1_send_buffer(void) nng_socket s; int v; bool b; - size_t sz; NUTS_PASS(nng_pair1_open(&s)); NUTS_PASS(nng_socket_get_int(s, NNG_OPT_SENDBUF, &v)); NUTS_TRUE(v == 0); NUTS_FAIL(nng_socket_get_bool(s, NNG_OPT_SENDBUF, &b), NNG_EBADTYPE); - sz = 1; - NUTS_FAIL(nng_socket_get(s, NNG_OPT_SENDBUF, &b, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_SENDBUF, -1), NNG_EINVAL); NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_SENDBUF, 100000), NNG_EINVAL); NUTS_FAIL( nng_socket_set_bool(s, NNG_OPT_SENDBUF, false), NNG_EBADTYPE); - NUTS_FAIL(nng_socket_set(s, NNG_OPT_SENDBUF, &b, 1), NNG_EINVAL); NUTS_PASS(nng_socket_set_int(s, NNG_OPT_SENDBUF, 100)); NUTS_PASS(nng_socket_get_int(s, NNG_OPT_SENDBUF, &v)); NUTS_TRUE(v == 100); @@ -491,19 +486,15 @@ test_pair1_recv_buffer(void) nng_socket s; int v; bool b; - size_t sz; NUTS_PASS(nng_pair1_open(&s)); NUTS_PASS(nng_socket_get_int(s, NNG_OPT_RECVBUF, &v)); NUTS_TRUE(v == 0); NUTS_FAIL(nng_socket_get_bool(s, NNG_OPT_RECVBUF, &b), NNG_EBADTYPE); - sz = 1; - NUTS_FAIL(nng_socket_get(s, NNG_OPT_RECVBUF, &b, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_RECVBUF, -1), NNG_EINVAL); NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_RECVBUF, 100000), NNG_EINVAL); NUTS_FAIL( nng_socket_set_bool(s, NNG_OPT_RECVBUF, false), NNG_EBADTYPE); - NUTS_FAIL(nng_socket_set(s, NNG_OPT_RECVBUF, &b, 1), NNG_EINVAL); NUTS_PASS(nng_socket_set_int(s, NNG_OPT_RECVBUF, 100)); NUTS_PASS(nng_socket_get_int(s, NNG_OPT_RECVBUF, &v)); NUTS_TRUE(v == 100); diff --git a/src/sp/protocol/pipeline0/push_test.c b/src/sp/protocol/pipeline0/push_test.c index dd3328f3..5eb98844 100644 --- a/src/sp/protocol/pipeline0/push_test.c +++ b/src/sp/protocol/pipeline0/push_test.c @@ -481,19 +481,15 @@ test_push_send_buffer(void) nng_socket s; int v; bool b; - size_t sz; NUTS_PASS(nng_push0_open(&s)); NUTS_PASS(nng_socket_get_int(s, NNG_OPT_SENDBUF, &v)); NUTS_TRUE(v == 0); NUTS_FAIL(nng_socket_get_bool(s, NNG_OPT_SENDBUF, &b), NNG_EBADTYPE); - sz = 1; - NUTS_FAIL(nng_socket_get(s, NNG_OPT_SENDBUF, &b, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_SENDBUF, -1), NNG_EINVAL); NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_SENDBUF, 100000), NNG_EINVAL); NUTS_FAIL( nng_socket_set_bool(s, NNG_OPT_SENDBUF, false), NNG_EBADTYPE); - NUTS_FAIL(nng_socket_set(s, NNG_OPT_SENDBUF, &b, 1), NNG_EINVAL); NUTS_PASS(nng_socket_set_int(s, NNG_OPT_SENDBUF, 100)); NUTS_PASS(nng_socket_get_int(s, NNG_OPT_SENDBUF, &v)); NUTS_TRUE(v == 100); diff --git a/src/sp/protocol/pubsub0/pub_test.c b/src/sp/protocol/pubsub0/pub_test.c index f3cf6e2d..a2a20dd7 100644 --- a/src/sp/protocol/pubsub0/pub_test.c +++ b/src/sp/protocol/pubsub0/pub_test.c @@ -264,7 +264,6 @@ test_pub_send_buf_option(void) nng_socket pub; int v; bool b; - size_t sz; const char *opt = NNG_OPT_SENDBUF; NUTS_PASS(nng_pub0_open(&pub)); @@ -276,15 +275,6 @@ test_pub_send_buf_option(void) NUTS_PASS(nng_socket_set_int(pub, opt, 3)); NUTS_PASS(nng_socket_get_int(pub, opt, &v)); NUTS_TRUE(v == 3); - v = 0; - sz = sizeof(v); - NUTS_PASS(nng_socket_get(pub, opt, &v, &sz)); - NUTS_TRUE(v == 3); - NUTS_TRUE(sz == sizeof(v)); - - NUTS_FAIL(nng_socket_set(pub, opt, "", 1), NNG_EINVAL); - sz = 1; - NUTS_FAIL(nng_socket_get(pub, opt, &v, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_bool(pub, opt, true), NNG_EBADTYPE); NUTS_FAIL(nng_socket_get_bool(pub, opt, &b), NNG_EBADTYPE); diff --git a/src/sp/protocol/pubsub0/sub_test.c b/src/sp/protocol/pubsub0/sub_test.c index d0a441ce..74a547f4 100644 --- a/src/sp/protocol/pubsub0/sub_test.c +++ b/src/sp/protocol/pubsub0/sub_test.c @@ -296,7 +296,6 @@ test_sub_recv_buf_option(void) nng_socket sub; int v; bool b; - size_t sz; const char *opt = NNG_OPT_RECVBUF; NUTS_PASS(nng_sub0_open(&sub)); @@ -308,15 +307,6 @@ test_sub_recv_buf_option(void) NUTS_PASS(nng_socket_set_int(sub, opt, 3)); NUTS_PASS(nng_socket_get_int(sub, opt, &v)); NUTS_TRUE(v == 3); - v = 0; - sz = sizeof(v); - NUTS_PASS(nng_socket_get(sub, opt, &v, &sz)); - NUTS_TRUE(v == 3); - NUTS_TRUE(sz == sizeof(v)); - - NUTS_FAIL(nng_socket_set(sub, opt, "", 1), NNG_EINVAL); - sz = 1; - NUTS_FAIL(nng_socket_get(sub, opt, &v, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_bool(sub, opt, true), NNG_EBADTYPE); NUTS_FAIL(nng_socket_get_bool(sub, opt, &b), NNG_EBADTYPE); @@ -355,7 +345,6 @@ test_sub_prefer_new_option(void) { nng_socket sub; bool b; - size_t sz; const char *opt = NNG_OPT_SUB_PREFNEW; NUTS_PASS(nng_sub0_open(&sub)); @@ -364,13 +353,6 @@ test_sub_prefer_new_option(void) NUTS_PASS(nng_socket_set_bool(sub, opt, false)); NUTS_PASS(nng_socket_get_bool(sub, opt, &b)); NUTS_TRUE(b == false); - sz = sizeof(b); - b = true; - NUTS_PASS(nng_socket_get(sub, opt, &b, &sz)); - NUTS_TRUE(b == false); - NUTS_TRUE(sz == sizeof(bool)); - - NUTS_FAIL(nng_socket_set(sub, opt, "abc", 3), NNG_EINVAL); NUTS_FAIL(nng_socket_set_int(sub, opt, 1), NNG_EBADTYPE); NUTS_CLOSE(sub); diff --git a/src/sp/protocol/pubsub0/xsub_test.c b/src/sp/protocol/pubsub0/xsub_test.c index fdbc5632..eb918e14 100644 --- a/src/sp/protocol/pubsub0/xsub_test.c +++ b/src/sp/protocol/pubsub0/xsub_test.c @@ -229,7 +229,6 @@ test_xsub_recv_buf_option(void) nng_socket sub; int v; bool b; - size_t sz; const char *opt = NNG_OPT_RECVBUF; NUTS_PASS(nng_sub0_open_raw(&sub)); @@ -240,15 +239,6 @@ test_xsub_recv_buf_option(void) NUTS_PASS(nng_socket_set_int(sub, opt, 3)); NUTS_PASS(nng_socket_get_int(sub, opt, &v)); NUTS_TRUE(v == 3); - v = 0; - sz = sizeof(v); - NUTS_PASS(nng_socket_get(sub, opt, &v, &sz)); - NUTS_TRUE(v == 3); - NUTS_TRUE(sz == sizeof(v)); - - NUTS_FAIL(nng_socket_set(sub, opt, "", 1), NNG_EINVAL); - sz = 1; - NUTS_FAIL(nng_socket_get(sub, opt, &v, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_bool(sub, opt, true), NNG_EBADTYPE); NUTS_FAIL(nng_socket_get_bool(sub, opt, &b), NNG_EBADTYPE); diff --git a/src/sp/protocol/reqrep0/req_test.c b/src/sp/protocol/reqrep0/req_test.c index 08b40b08..71e08877 100644 --- a/src/sp/protocol/reqrep0/req_test.c +++ b/src/sp/protocol/reqrep0/req_test.c @@ -36,7 +36,6 @@ test_req_ttl_option(void) nng_socket req; int v; bool b; - size_t sz; const char *opt = NNG_OPT_MAXTTL; NUTS_PASS(nng_req0_open(&req)); @@ -51,15 +50,6 @@ test_req_ttl_option(void) NUTS_PASS(nng_socket_set_int(req, opt, 3)); NUTS_PASS(nng_socket_get_int(req, opt, &v)); NUTS_TRUE(v == 3); - v = 0; - sz = sizeof(v); - NUTS_PASS(nng_socket_get(req, opt, &v, &sz)); - NUTS_TRUE(v == 3); - NUTS_TRUE(sz == sizeof(v)); - - NUTS_FAIL(nng_socket_set(req, opt, "", 1), NNG_EINVAL); - sz = 1; - NUTS_FAIL(nng_socket_get(req, opt, &v, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_bool(req, opt, true), NNG_EBADTYPE); NUTS_FAIL(nng_socket_get_bool(req, opt, &b), NNG_EBADTYPE); @@ -72,14 +62,11 @@ test_req_resend_option(void) nng_socket req; nng_duration d; bool b; - size_t sz = sizeof(b); const char *opt = NNG_OPT_REQ_RESENDTIME; NUTS_PASS(nng_req0_open(&req)); NUTS_TRUE(nng_socket_set_ms(req, opt, 10) == 0); - NUTS_FAIL(nng_socket_set(req, opt, "", 1), NNG_EINVAL); - NUTS_FAIL(nng_socket_get(req, opt, &b, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_bool(req, opt, true), NNG_EBADTYPE); NUTS_FAIL(nng_socket_get_bool(req, opt, &b), NNG_EBADTYPE); @@ -94,14 +81,11 @@ test_req_resend_tick_option(void) nng_socket req; nng_duration d; bool b; - size_t sz = sizeof(b); const char *opt = NNG_OPT_REQ_RESENDTICK; NUTS_PASS(nng_req0_open(&req)); NUTS_TRUE(nng_socket_set_ms(req, opt, 10) == 0); - NUTS_FAIL(nng_socket_set(req, opt, "", 1), NNG_EINVAL); - NUTS_FAIL(nng_socket_get(req, opt, &b, &sz), NNG_EINVAL); NUTS_FAIL(nng_socket_set_bool(req, opt, true), NNG_EBADTYPE); NUTS_FAIL(nng_socket_get_bool(req, opt, &b), NNG_EBADTYPE); diff --git a/src/sp/protocol/reqrep0/xrep_test.c b/src/sp/protocol/reqrep0/xrep_test.c index 3c033e9b..d5110469 100644 --- a/src/sp/protocol/reqrep0/xrep_test.c +++ b/src/sp/protocol/reqrep0/xrep_test.c @@ -321,7 +321,6 @@ test_xrep_ttl_option(void) nng_socket rep; int v; bool b; - size_t sz; const char *opt = NNG_OPT_MAXTTL; NUTS_PASS(nng_rep0_open_raw(&rep)); @@ -334,15 +333,6 @@ test_xrep_ttl_option(void) NUTS_PASS(nng_socket_set_int(rep, opt, 3)); NUTS_PASS(nng_socket_get_int(rep, opt, &v)); NUTS_TRUE(v == 3); - v = 0; - sz = sizeof(v); - NUTS_PASS(nng_socket_get(rep, opt, &v, &sz)); - NUTS_TRUE(v == 3); - NUTS_TRUE(sz == sizeof(v)); - - NUTS_TRUE(nng_socket_set(rep, opt, "", 1) == NNG_EINVAL); - sz = 1; - NUTS_TRUE(nng_socket_get(rep, opt, &v, &sz) == NNG_EINVAL); NUTS_TRUE(nng_socket_set_bool(rep, opt, true) == NNG_EBADTYPE); NUTS_TRUE(nng_socket_get_bool(rep, opt, &b) == NNG_EBADTYPE); diff --git a/src/sp/protocol/reqrep0/xreq_test.c b/src/sp/protocol/reqrep0/xreq_test.c index e8725acb..28f381fe 100644 --- a/src/sp/protocol/reqrep0/xreq_test.c +++ b/src/sp/protocol/reqrep0/xreq_test.c @@ -321,7 +321,6 @@ test_xreq_ttl_option(void) nng_socket rep; int v; bool b; - size_t sz; const char *opt = NNG_OPT_MAXTTL; NUTS_PASS(nng_req0_open_raw(&rep)); @@ -334,15 +333,7 @@ test_xreq_ttl_option(void) NUTS_PASS(nng_socket_set_int(rep, opt, 3)); NUTS_PASS(nng_socket_get_int(rep, opt, &v)); NUTS_TRUE(v == 3); - v = 0; - sz = sizeof(v); - NUTS_PASS(nng_socket_get(rep, opt, &v, &sz)); - NUTS_TRUE(v == 3); - NUTS_TRUE(sz == sizeof(v)); - NUTS_TRUE(nng_socket_set(rep, opt, "", 1) == NNG_EINVAL); - sz = 1; - NUTS_TRUE(nng_socket_get(rep, opt, &v, &sz) == NNG_EINVAL); NUTS_TRUE(nng_socket_set_bool(rep, opt, true) == NNG_EBADTYPE); NUTS_TRUE(nng_socket_get_bool(rep, opt, &b) == NNG_EBADTYPE); 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); |
