mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

Move netmgr/uv-compat.h to <isc/uv.h>

Browse Source 
As we are going to use libuv outside of the netmgr, we need the shims to
be readily available for the rest of the codebase.

Move the "netmgr/uv-compat.h" to <isc/uv.h> and netmgr/uv-compat.c to
uv.c, and as a rule of thumb, the users of libuv should include
<isc/uv.h> instead of <uv.h> directly.

Additionally, merge netmgr/uverr2result.c into uv.c and rename the
single function from isc__nm_uverr2result() to isc_uverr2result().
This commit is contained in:
Ondřej Surý
2022-04-27 17:41:47 +02:00
parent 24c3879675
commit b43812692d
24 changed files with 168 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/isc/netmgr/netmgr.c
View File

@@ -13,7 +13,6 @@
#include <inttypes.h>
#include <unistd.h>
#include <uv.h>
#include <isc/atomic.h>
#include <isc/backtrace.h>
@@ -39,12 +38,12 @@
#include <isc/thread.h>
#include <isc/tls.h>
#include <isc/util.h>
#include <isc/uv.h>
#include "netmgr-int.h"
#include "netmgr_p.h"
#include "openssl_shim.h"
#include "trampoline_p.h"
#include "uv-compat.h"
/*%
* How many isc_nmhandles and isc_nm_uvreqs will we be
@@ -3097,7 +3096,7 @@ isc__nm_after_work_cb(uv_work_t *req, int status) {
isc_nm_t *netmgr = work->netmgr;
if (status != 0) {
result = isc__nm_uverr2result(status);
result = isc_uverr2result(status);
}
work->after_cb(work->data, result);