aboutsummaryrefslogtreecommitdiff
path: root/src/sp/transport
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2025-04-27 19:07:03 -0700
committerGarrett D'Amore <garrett@damore.org>2025-04-27 19:07:05 -0700
commitc5b07415cc3a6a7960cb3ca2a2aaf70b1cbe3469 (patch)
tree7068cd50d8da4a1f492cfc08a25636a43a0cb194 /src/sp/transport
parent9ebf1b2d2cc4bb850cc152168c08a1bb9e3e8ddb (diff)
downloadnng-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/sp/transport')
-rw-r--r--src/sp/transport/inproc/inproc.c4
-rw-r--r--src/sp/transport/ipc/ipc.c6
-rw-r--r--src/sp/transport/socket/sockfd.c6
-rw-r--r--src/sp/transport/tcp/tcp.c8
-rw-r--r--src/sp/transport/tls/tls.c6
-rw-r--r--src/sp/transport/udp/udp.c4
-rw-r--r--src/sp/transport/ws/websocket.c8
7 files changed, 21 insertions, 21 deletions
diff --git a/src/sp/transport/inproc/inproc.c b/src/sp/transport/inproc/inproc.c
index 672c4d33..1c7b88e6 100644
--- a/src/sp/transport/inproc/inproc.c
+++ b/src/sp/transport/inproc/inproc.c
@@ -176,7 +176,7 @@ inproc_queue_run(inproc_queue *queue)
}
static void
-inproc_queue_cancel(nni_aio *aio, void *arg, int rv)
+inproc_queue_cancel(nni_aio *aio, void *arg, nng_err rv)
{
inproc_queue *queue = arg;
@@ -433,7 +433,7 @@ inproc_accept_clients(inproc_ep *srv)
}
static void
-inproc_ep_cancel(nni_aio *aio, void *arg, int rv)
+inproc_ep_cancel(nni_aio *aio, void *arg, nng_err rv)
{
inproc_ep *ep = arg;
diff --git a/src/sp/transport/ipc/ipc.c b/src/sp/transport/ipc/ipc.c
index 5fea1632..82ec3f7e 100644
--- a/src/sp/transport/ipc/ipc.c
+++ b/src/sp/transport/ipc/ipc.c
@@ -413,7 +413,7 @@ error:
}
static void
-ipc_pipe_send_cancel(nni_aio *aio, void *arg, int rv)
+ipc_pipe_send_cancel(nni_aio *aio, void *arg, nng_err rv)
{
ipc_pipe *p = arg;
@@ -500,7 +500,7 @@ ipc_pipe_send(void *arg, nni_aio *aio)
}
static void
-ipc_pipe_recv_cancel(nni_aio *aio, void *arg, int rv)
+ipc_pipe_recv_cancel(nni_aio *aio, void *arg, nng_err rv)
{
ipc_pipe *p = arg;
@@ -835,7 +835,7 @@ ipc_ep_init_listener(void *arg, nng_url *url, nni_listener *listener)
}
static void
-ipc_ep_cancel(nni_aio *aio, void *arg, int rv)
+ipc_ep_cancel(nni_aio *aio, void *arg, nng_err rv)
{
ipc_ep *ep = arg;
nni_mtx_lock(&ep->mtx);
diff --git a/src/sp/transport/socket/sockfd.c b/src/sp/transport/socket/sockfd.c
index 9eea18f6..5138afaa 100644
--- a/src/sp/transport/socket/sockfd.c
+++ b/src/sp/transport/socket/sockfd.c
@@ -382,7 +382,7 @@ recv_error:
}
static void
-sfd_tran_pipe_send_cancel(nni_aio *aio, void *arg, int rv)
+sfd_tran_pipe_send_cancel(nni_aio *aio, void *arg, nng_err rv)
{
sfd_tran_pipe *p = arg;
@@ -470,7 +470,7 @@ sfd_tran_pipe_send(void *arg, nni_aio *aio)
}
static void
-sfd_tran_pipe_recv_cancel(nni_aio *aio, void *arg, int rv)
+sfd_tran_pipe_recv_cancel(nni_aio *aio, void *arg, nng_err rv)
{
sfd_tran_pipe *p = arg;
@@ -728,7 +728,7 @@ sfd_tran_listener_init(void *arg, nng_url *url, nni_listener *nlistener)
}
static void
-sfd_tran_ep_cancel(nni_aio *aio, void *arg, int rv)
+sfd_tran_ep_cancel(nni_aio *aio, void *arg, nng_err rv)
{
sfd_tran_ep *ep = arg;
nni_mtx_lock(&ep->mtx);
diff --git a/src/sp/transport/tcp/tcp.c b/src/sp/transport/tcp/tcp.c
index c59ec5aa..3bc124ee 100644
--- a/src/sp/transport/tcp/tcp.c
+++ b/src/sp/transport/tcp/tcp.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>
//
@@ -402,7 +402,7 @@ recv_error:
}
static void
-tcptran_pipe_send_cancel(nni_aio *aio, void *arg, int rv)
+tcptran_pipe_send_cancel(nni_aio *aio, void *arg, nng_err rv)
{
tcptran_pipe *p = arg;
@@ -491,7 +491,7 @@ tcptran_pipe_send(void *arg, nni_aio *aio)
}
static void
-tcptran_pipe_recv_cancel(nni_aio *aio, void *arg, int rv)
+tcptran_pipe_recv_cancel(nni_aio *aio, void *arg, nng_err rv)
{
tcptran_pipe *p = arg;
@@ -846,7 +846,7 @@ tcptran_listener_init(void *arg, nng_url *url, nni_listener *nlistener)
}
static void
-tcptran_ep_cancel(nni_aio *aio, void *arg, int rv)
+tcptran_ep_cancel(nni_aio *aio, void *arg, nng_err rv)
{
tcptran_ep *ep = arg;
nni_mtx_lock(&ep->mtx);
diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c
index ed4fad05..643146f7 100644
--- a/src/sp/transport/tls/tls.c
+++ b/src/sp/transport/tls/tls.c
@@ -395,7 +395,7 @@ recv_error:
}
static void
-tlstran_pipe_send_cancel(nni_aio *aio, void *arg, int rv)
+tlstran_pipe_send_cancel(nni_aio *aio, void *arg, nng_err rv)
{
tlstran_pipe *p = arg;
@@ -476,7 +476,7 @@ tlstran_pipe_send(void *arg, nni_aio *aio)
}
static void
-tlstran_pipe_recv_cancel(nni_aio *aio, void *arg, int rv)
+tlstran_pipe_recv_cancel(nni_aio *aio, void *arg, nng_err rv)
{
tlstran_pipe *p = arg;
@@ -815,7 +815,7 @@ tlstran_ep_init_listener(void *arg, nng_url *url, nni_listener *nlistener)
}
static void
-tlstran_ep_cancel(nni_aio *aio, void *arg, int rv)
+tlstran_ep_cancel(nni_aio *aio, void *arg, nng_err rv)
{
tlstran_ep *ep = arg;
nni_mtx_lock(&ep->mtx);
diff --git a/src/sp/transport/udp/udp.c b/src/sp/transport/udp/udp.c
index b068be03..2e85fd0f 100644
--- a/src/sp/transport/udp/udp.c
+++ b/src/sp/transport/udp/udp.c
@@ -999,7 +999,7 @@ udp_pipe_send(void *arg, nni_aio *aio)
}
static void
-udp_pipe_recv_cancel(nni_aio *aio, void *arg, int rv)
+udp_pipe_recv_cancel(nni_aio *aio, void *arg, nng_err rv)
{
udp_pipe *p = arg;
udp_ep *ep = p->ep;
@@ -1430,7 +1430,7 @@ udp_listener_init(void *arg, nng_url *url, nni_listener *nlistener)
}
static void
-udp_ep_cancel(nni_aio *aio, void *arg, int rv)
+udp_ep_cancel(nni_aio *aio, void *arg, nng_err rv)
{
udp_ep *ep = arg;
nni_mtx_lock(&ep->mtx);
diff --git a/src/sp/transport/ws/websocket.c b/src/sp/transport/ws/websocket.c
index 23256edc..f93b1f49 100644
--- a/src/sp/transport/ws/websocket.c
+++ b/src/sp/transport/ws/websocket.c
@@ -106,7 +106,7 @@ wstran_pipe_recv_cb(void *arg)
}
static void
-wstran_pipe_recv_cancel(nni_aio *aio, void *arg, int rv)
+wstran_pipe_recv_cancel(nni_aio *aio, void *arg, nng_err rv)
{
ws_pipe *p = arg;
nni_mtx_lock(&p->mtx);
@@ -137,7 +137,7 @@ wstran_pipe_recv(void *arg, nni_aio *aio)
}
static void
-wstran_pipe_send_cancel(nni_aio *aio, void *arg, int rv)
+wstran_pipe_send_cancel(nni_aio *aio, void *arg, nng_err rv)
{
ws_pipe *p = arg;
nni_mtx_lock(&p->mtx);
@@ -241,7 +241,7 @@ wstran_listener_bind(void *arg, nng_url *url)
}
static void
-wstran_listener_cancel(nni_aio *aio, void *arg, int rv)
+wstran_listener_cancel(nni_aio *aio, void *arg, nng_err rv)
{
ws_listener *l = arg;
@@ -277,7 +277,7 @@ wstran_listener_accept(void *arg, nni_aio *aio)
}
static void
-wstran_dialer_cancel(nni_aio *aio, void *arg, int rv)
+wstran_dialer_cancel(nni_aio *aio, void *arg, nng_err rv)
{
ws_dialer *d = arg;