From 57e736b5be2052484eec44889586bd89a2724c71 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Fri, 3 Jan 2025 12:46:33 -0800 Subject: api: rename nng_send_aio and nng_recv_aio to nng_socket_send and nng_socket_recv This aligns more closely with the nng_ctx functions. --- src/sp/protocol/survey0/respond_test.c | 6 +++--- src/sp/protocol/survey0/survey_test.c | 2 +- src/sp/protocol/survey0/xrespond_test.c | 6 +++--- src/sp/protocol/survey0/xsurvey_test.c | 2 +- 4 files changed, 8 insertions(+), 8 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 0725efb7..5b4bcff9 100644 --- a/src/sp/protocol/survey0/respond_test.c +++ b/src/sp/protocol/survey0/respond_test.c @@ -163,8 +163,8 @@ test_resp_double_recv(void) NUTS_PASS(nng_aio_alloc(&aio1, NULL, NULL)); NUTS_PASS(nng_aio_alloc(&aio2, NULL, NULL)); - nng_recv_aio(s1, aio1); - nng_recv_aio(s1, aio2); + nng_socket_recv(s1, aio1); + nng_socket_recv(s1, aio2); nng_aio_wait(aio2); NUTS_FAIL(nng_aio_result(aio2), NNG_ESTATE); @@ -194,7 +194,7 @@ test_resp_close_pipe_before_send(void) NUTS_MARRY(surv, resp); NUTS_SEND(surv, "test"); - nng_recv_aio(resp, aio1); + nng_socket_recv(resp, aio1); nng_aio_wait(aio1); NUTS_PASS(nng_aio_result(aio1)); NUTS_TRUE((m = nng_aio_get_msg(aio1)) != NULL); diff --git a/src/sp/protocol/survey0/survey_test.c b/src/sp/protocol/survey0/survey_test.c index 1be9dee4..bf6fbb08 100644 --- a/src/sp/protocol/survey0/survey_test.c +++ b/src/sp/protocol/survey0/survey_test.c @@ -232,7 +232,7 @@ test_surv_cancel_abort_recv(void) NUTS_SLEEP(100); nng_aio_set_timeout(aio, 5 * SECOND); - nng_recv_aio(surv, aio); + nng_socket_recv(surv, aio); // Give time for this recv to post properly. NUTS_SLEEP(100); diff --git a/src/sp/protocol/survey0/xrespond_test.c b/src/sp/protocol/survey0/xrespond_test.c index 03ac5fc1..bda924c3 100644 --- a/src/sp/protocol/survey0/xrespond_test.c +++ b/src/sp/protocol/survey0/xrespond_test.c @@ -171,7 +171,7 @@ test_xresp_close_pipe_before_send(void) NUTS_MARRY(surv, resp); NUTS_SEND(surv, "test"); - nng_recv_aio(resp, aio1); + nng_socket_recv(resp, aio1); nng_aio_wait(aio1); NUTS_PASS(nng_aio_result(aio1)); NUTS_TRUE((m = nng_aio_get_msg(aio1)) != NULL); @@ -265,7 +265,7 @@ test_xresp_recv_aio_stopped(void) NUTS_PASS(nng_aio_alloc(&aio, NULL, NULL)); nng_aio_stop(aio); - nng_recv_aio(resp, aio); + nng_socket_recv(resp, aio); nng_aio_wait(aio); NUTS_FAIL(nng_aio_result(aio), NNG_ESTOPPED); NUTS_CLOSE(resp); @@ -281,7 +281,7 @@ test_xresp_recv_aio_canceled(void) NUTS_PASS(nng_respondent0_open_raw(&resp)); NUTS_PASS(nng_aio_alloc(&aio, NULL, NULL)); - nng_recv_aio(resp, aio); + nng_socket_recv(resp, aio); nng_aio_cancel(aio); nng_aio_wait(aio); NUTS_FAIL(nng_aio_result(aio), NNG_ECANCELED); diff --git a/src/sp/protocol/survey0/xsurvey_test.c b/src/sp/protocol/survey0/xsurvey_test.c index 44b2c990..1b9c52fd 100644 --- a/src/sp/protocol/survey0/xsurvey_test.c +++ b/src/sp/protocol/survey0/xsurvey_test.c @@ -170,7 +170,7 @@ test_xsurvey_recv_aio_stopped(void) NUTS_PASS(nng_aio_alloc(&aio, NULL, NULL)); nng_aio_stop(aio); - nng_recv_aio(surv, aio); + nng_socket_recv(surv, aio); nng_aio_wait(aio); NUTS_FAIL(nng_aio_result(aio), NNG_ESTOPPED); NUTS_CLOSE(surv); -- cgit v1.2.3-70-g09d2