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.

6 files changed, 12 insertions, 12 deletions

diff --git a/src/supplemental/http/http_client.c b/src/supplemental/http/http_client.c
index 5c408718..06215ca0 100644
--- a/src/supplemental/http/http_client.c
+++ b/src/supplemental/http/http_client.c
@@ -175,7 +175,7 @@ nni_http_client_get(
 }
 
 static void
-http_dial_cancel(nni_aio *aio, void *arg, int rv)
+http_dial_cancel(nni_aio *aio, void *arg, nng_err rv)
 {
 	nni_http_client *c = arg;
 	nni_mtx_lock(&c->mtx);
@@ -366,7 +366,7 @@ error:
 }
 
 static void
-http_txn_cancel(nni_aio *aio, void *arg, int rv)
+http_txn_cancel(nni_aio *aio, void *arg, nng_err rv)
 {
 	http_txn *txn = arg;
 	nni_mtx_lock(&http_txn_lk);
diff --git a/src/supplemental/http/http_conn.c b/src/supplemental/http/http_conn.c
index 00961852..5baa3136 100644
--- a/src/supplemental/http/http_conn.c
+++ b/src/supplemental/http/http_conn.c
@@ -434,7 +434,7 @@ http_rd_cb(void *arg)
 }
 
 static void
-http_rd_cancel(nni_aio *aio, void *arg, int rv)
+http_rd_cancel(nni_aio *aio, void *arg, nng_err rv)
 {
 	nni_http_conn *conn = arg;
 
@@ -549,7 +549,7 @@ done:
 }
 
 static void
-http_wr_cancel(nni_aio *aio, void *arg, int rv)
+http_wr_cancel(nni_aio *aio, void *arg, nng_err rv)
 {
 	nni_http_conn *conn = arg;
 
diff --git a/src/supplemental/tls/tls_common.c b/src/supplemental/tls/tls_common.c
index c068109d..c31e5fe9 100644
--- a/src/supplemental/tls/tls_common.c
+++ b/src/supplemental/tls/tls_common.c
@@ -47,7 +47,7 @@ static void tls_bio_send_start(tls_conn *);
 static void tls_bio_error(tls_conn *, int);
 
 static void
-tls_cancel(nni_aio *aio, void *arg, int rv)
+tls_cancel(nni_aio *aio, void *arg, nng_err rv)
 {
 	tls_conn *conn = arg;
 	nni_mtx_lock(&conn->lock);
diff --git a/src/supplemental/tls/tls_dialer.c b/src/supplemental/tls/tls_dialer.c
index d0fee0ac..7f547839 100644
--- a/src/supplemental/tls/tls_dialer.c
+++ b/src/supplemental/tls/tls_dialer.c
@@ -57,7 +57,7 @@ tls_dialer_stop(void *arg)
 // Dialer cancel is called when the user has indicated that they no longer
 // want to wait for the connection to establish.
 static void
-tls_dialer_cancel(nni_aio *aio, void *arg, int rv)
+tls_dialer_cancel(nni_aio *aio, void *arg, nng_err rv)
 {
 	tls_stream *ts = arg;
 
diff --git a/src/supplemental/tls/tls_listener.c b/src/supplemental/tls/tls_listener.c
index 5e884165..07cdbda6 100644
--- a/src/supplemental/tls/tls_listener.c
+++ b/src/supplemental/tls/tls_listener.c
@@ -67,7 +67,7 @@ tls_listener_listen(void *arg)
 // Listener cancel is called when the user has indicated that they no longer
 // want to wait for the connection to establish.
 static void
-tls_listener_cancel(nni_aio *aio, void *arg, int rv)
+tls_listener_cancel(nni_aio *aio, void *arg, nng_err rv)
 {
 	tls_stream *ts = arg;
 
diff --git a/src/supplemental/websocket/websocket.c b/src/supplemental/websocket/websocket.c
index 86edf123..0f5c6598 100644
--- a/src/supplemental/websocket/websocket.c
+++ b/src/supplemental/websocket/websocket.c
@@ -547,7 +547,7 @@ ws_start_write(nni_ws *ws)
 }
 
 static void
-ws_cancel_close(nni_aio *aio, void *arg, int rv)
+ws_cancel_close(nni_aio *aio, void *arg, nng_err rv)
 {
 	nni_ws *ws = arg;
 	nni_mtx_lock(&ws->mtx);
@@ -653,7 +653,7 @@ ws_write_cb(void *arg)
 }
 
 static void
-ws_write_cancel(nni_aio *aio, void *arg, int rv)
+ws_write_cancel(nni_aio *aio, void *arg, nng_err rv)
 {
 	nni_ws   *ws = arg;
 	ws_frame *frame;
@@ -1108,7 +1108,7 @@ ws_read_cb(void *arg)
 }
 
 static void
-ws_read_cancel(nni_aio *aio, void *arg, int rv)
+ws_read_cancel(nni_aio *aio, void *arg, nng_err rv)
 {
 	nni_ws *ws = arg;
 
@@ -1607,7 +1607,7 @@ err:
 }
 
 static void
-ws_accept_cancel(nni_aio *aio, void *arg, int rv)
+ws_accept_cancel(nni_aio *aio, void *arg, nng_err rv)
 {
 	nni_ws_listener *l = arg;
 
@@ -2203,7 +2203,7 @@ ws_dialer_free(void *arg)
 }
 
 static void
-ws_dial_cancel(nni_aio *aio, void *arg, int rv)
+ws_dial_cancel(nni_aio *aio, void *arg, nng_err rv)
 {
 	nni_ws *ws = arg;