diff options
| author | Garrett D'Amore <garrett@damore.org> | 2025-04-27 19:07:03 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2025-04-27 19:07:05 -0700 |
| commit | c5b07415cc3a6a7960cb3ca2a2aaf70b1cbe3469 (patch) | |
| tree | 7068cd50d8da4a1f492cfc08a25636a43a0cb194 /src/platform | |
| parent | 9ebf1b2d2cc4bb850cc152168c08a1bb9e3e8ddb (diff) | |
| download | nng-c5b07415cc3a6a7960cb3ca2a2aaf70b1cbe3469.tar.gz nng-c5b07415cc3a6a7960cb3ca2a2aaf70b1cbe3469.tar.bz2 nng-c5b07415cc3a6a7960cb3ca2a2aaf70b1cbe3469.zip | |
AIO: Use nng_err for cancellation callback instead of int.
This is part of our work to improve type safety/awareness, and also
improve debugger support, for NNG error codes. There are still quite
a few more but this should help.
Diffstat (limited to 'src/platform')
| -rw-r--r-- | src/platform/posix/posix_ipcconn.c | 2 | ||||
| -rw-r--r-- | src/platform/posix/posix_ipcdial.c | 2 | ||||
| -rw-r--r-- | src/platform/posix/posix_ipclisten.c | 2 | ||||
| -rw-r--r-- | src/platform/posix/posix_resolv_gai.c | 2 | ||||
| -rw-r--r-- | src/platform/posix/posix_sockfd.c | 2 | ||||
| -rw-r--r-- | src/platform/posix/posix_tcpconn.c | 2 | ||||
| -rw-r--r-- | src/platform/posix/posix_tcpdial.c | 2 | ||||
| -rw-r--r-- | src/platform/posix/posix_tcplisten.c | 4 | ||||
| -rw-r--r-- | src/platform/posix/posix_udp.c | 2 | ||||
| -rw-r--r-- | src/platform/windows/win_ipcconn.c | 2 | ||||
| -rw-r--r-- | src/platform/windows/win_ipcdial.c | 4 | ||||
| -rw-r--r-- | src/platform/windows/win_ipclisten.c | 4 | ||||
| -rw-r--r-- | src/platform/windows/win_tcpconn.c | 4 | ||||
| -rw-r--r-- | src/platform/windows/win_tcpdial.c | 4 | ||||
| -rw-r--r-- | src/platform/windows/win_tcplisten.c | 4 | ||||
| -rw-r--r-- | src/platform/windows/win_udp.c | 2 |
16 files changed, 22 insertions, 22 deletions
diff --git a/src/platform/posix/posix_ipcconn.c b/src/platform/posix/posix_ipcconn.c index 41676340..a585bafd 100644 --- a/src/platform/posix/posix_ipcconn.c +++ b/src/platform/posix/posix_ipcconn.c @@ -231,7 +231,7 @@ ipc_cb(void *arg, unsigned events) } static void -ipc_cancel(nni_aio *aio, void *arg, int rv) +ipc_cancel(nni_aio *aio, void *arg, nng_err rv) { ipc_conn *c = arg; diff --git a/src/platform/posix/posix_ipcdial.c b/src/platform/posix/posix_ipcdial.c index e106cfc9..d299f947 100644 --- a/src/platform/posix/posix_ipcdial.c +++ b/src/platform/posix/posix_ipcdial.c @@ -82,7 +82,7 @@ nni_posix_ipc_dialer_rele(ipc_dialer *d) } static void -ipc_dialer_cancel(nni_aio *aio, void *arg, int rv) +ipc_dialer_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_ipc_dialer *d = arg; nni_ipc_conn *c; diff --git a/src/platform/posix/posix_ipclisten.c b/src/platform/posix/posix_ipclisten.c index d13ac063..98432f71 100644 --- a/src/platform/posix/posix_ipclisten.c +++ b/src/platform/posix/posix_ipclisten.c @@ -164,7 +164,7 @@ ipc_listener_cb(void *arg, unsigned events) } static void -ipc_listener_cancel(nni_aio *aio, void *arg, int rv) +ipc_listener_cancel(nni_aio *aio, void *arg, nng_err rv) { ipc_listener *l = arg; diff --git a/src/platform/posix/posix_resolv_gai.c b/src/platform/posix/posix_resolv_gai.c index c5051ffd..2eba891b 100644 --- a/src/platform/posix/posix_resolv_gai.c +++ b/src/platform/posix/posix_resolv_gai.c @@ -54,7 +54,7 @@ static nni_mtx resolv_mtx; static nni_cv resolv_cv; static void -resolv_cancel(nni_aio *aio, void *arg, int rv) +resolv_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_resolv_item *item = arg; diff --git a/src/platform/posix/posix_sockfd.c b/src/platform/posix/posix_sockfd.c index bc397fc6..bc411252 100644 --- a/src/platform/posix/posix_sockfd.c +++ b/src/platform/posix/posix_sockfd.c @@ -261,7 +261,7 @@ sfd_cb(void *arg, unsigned events) } static void -sfd_cancel(nni_aio *aio, void *arg, int rv) +sfd_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_sfd_conn *c = arg; diff --git a/src/platform/posix/posix_tcpconn.c b/src/platform/posix/posix_tcpconn.c index 920c3ff9..9b61a68e 100644 --- a/src/platform/posix/posix_tcpconn.c +++ b/src/platform/posix/posix_tcpconn.c @@ -266,7 +266,7 @@ tcp_cb(void *arg, unsigned events) } static void -tcp_cancel(nni_aio *aio, void *arg, int rv) +tcp_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_tcp_conn *c = arg; diff --git a/src/platform/posix/posix_tcpdial.c b/src/platform/posix/posix_tcpdial.c index 7b2f09a9..52807892 100644 --- a/src/platform/posix/posix_tcpdial.c +++ b/src/platform/posix/posix_tcpdial.c @@ -113,7 +113,7 @@ nni_posix_tcp_dialer_rele(nni_tcp_dialer *d) } static void -tcp_dialer_cancel(nni_aio *aio, void *arg, int rv) +tcp_dialer_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_tcp_dialer *d = arg; nni_tcp_conn *c; diff --git a/src/platform/posix/posix_tcplisten.c b/src/platform/posix/posix_tcplisten.c index 29b5ea65..13ecb33e 100644 --- a/src/platform/posix/posix_tcplisten.c +++ b/src/platform/posix/posix_tcplisten.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2018 Devolutions <info@devolutions.net> // @@ -161,7 +161,7 @@ tcp_listener_cb(void *arg, unsigned events) } static void -tcp_listener_cancel(nni_aio *aio, void *arg, int rv) +tcp_listener_cancel(nni_aio *aio, void *arg, nng_err rv) { tcp_listener *l = arg; diff --git a/src/platform/posix/posix_udp.c b/src/platform/posix/posix_udp.c index 14bb6c22..b643d0b2 100644 --- a/src/platform/posix/posix_udp.c +++ b/src/platform/posix/posix_udp.c @@ -377,7 +377,7 @@ nni_plat_udp_close(nni_plat_udp *udp) } void -nni_plat_udp_cancel(nni_aio *aio, void *arg, int rv) +nni_plat_udp_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_plat_udp *udp = arg; diff --git a/src/platform/windows/win_ipcconn.c b/src/platform/windows/win_ipcconn.c index 353d703f..5493d32f 100644 --- a/src/platform/windows/win_ipcconn.c +++ b/src/platform/windows/win_ipcconn.c @@ -138,7 +138,7 @@ ipc_recv_cb(nni_win_io *io, int rv, size_t num) } static void -ipc_recv_cancel(nni_aio *aio, void *arg, int rv) +ipc_recv_cancel(nni_aio *aio, void *arg, nng_err rv) { ipc_conn *c = arg; nni_mtx_lock(&c->mtx); diff --git a/src/platform/windows/win_ipcdial.c b/src/platform/windows/win_ipcdial.c index d5e44750..43c1f744 100644 --- a/src/platform/windows/win_ipcdial.c +++ b/src/platform/windows/win_ipcdial.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2019 Devolutions <info@devolutions.net> // @@ -123,7 +123,7 @@ ipc_dial_thr(void *arg) } static void -ipc_dial_cancel(nni_aio *aio, void *arg, int rv) +ipc_dial_cancel(nni_aio *aio, void *arg, nng_err rv) { ipc_dialer *d = arg; ipc_dial_work *w = &ipc_connector; diff --git a/src/platform/windows/win_ipclisten.c b/src/platform/windows/win_ipclisten.c index cb37ef88..e40f51d7 100644 --- a/src/platform/windows/win_ipclisten.c +++ b/src/platform/windows/win_ipclisten.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2019 Devolutions <info@devolutions.net> // @@ -245,7 +245,7 @@ ipc_listener_listen(void *arg) } static void -ipc_accept_cancel(nni_aio *aio, void *arg, int rv) +ipc_accept_cancel(nni_aio *aio, void *arg, nng_err rv) { ipc_listener *l = arg; diff --git a/src/platform/windows/win_tcpconn.c b/src/platform/windows/win_tcpconn.c index e8e66f0e..e6d30b7a 100644 --- a/src/platform/windows/win_tcpconn.c +++ b/src/platform/windows/win_tcpconn.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2018 Devolutions <info@devolutions.net> // @@ -96,7 +96,7 @@ tcp_recv_cb(nni_win_io *io, int rv, size_t num) } static void -tcp_recv_cancel(nni_aio *aio, void *arg, int rv) +tcp_recv_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_tcp_conn *c = arg; nni_mtx_lock(&c->mtx); diff --git a/src/platform/windows/win_tcpdial.c b/src/platform/windows/win_tcpdial.c index 12bedf0a..4d3771f2 100644 --- a/src/platform/windows/win_tcpdial.c +++ b/src/platform/windows/win_tcpdial.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2018 Devolutions <info@devolutions.net> // @@ -96,7 +96,7 @@ nni_tcp_dialer_fini(nni_tcp_dialer *d) } static void -tcp_dial_cancel(nni_aio *aio, void *arg, int rv) +tcp_dial_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_tcp_dialer *d = arg; nni_tcp_conn *c; diff --git a/src/platform/windows/win_tcplisten.c b/src/platform/windows/win_tcplisten.c index 91ecccb0..c8c6ab2c 100644 --- a/src/platform/windows/win_tcplisten.c +++ b/src/platform/windows/win_tcplisten.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2018 Devolutions <info@devolutions.net> // @@ -196,7 +196,7 @@ tcp_listener_listen(void *arg) } static void -tcp_accept_cancel(nni_aio *aio, void *arg, int rv) +tcp_accept_cancel(nni_aio *aio, void *arg, nng_err rv) { tcp_listener *l = arg; diff --git a/src/platform/windows/win_udp.c b/src/platform/windows/win_udp.c index 0ff3ca1c..709ef82e 100644 --- a/src/platform/windows/win_udp.c +++ b/src/platform/windows/win_udp.c @@ -169,7 +169,7 @@ nni_plat_udp_send(nni_plat_udp *u, nni_aio *aio) } static void -udp_recv_cancel(nni_aio *aio, void *arg, int rv) +udp_recv_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_plat_udp *u = arg; nni_mtx_lock(&u->lk); |
