gre-ilya/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unix: merge read/write code into single functions

Browse Source 
I split those out in a previous commit in anticipation of changes that
never came. Let's merge them back.
This commit is contained in:
Ben Noordhuis 2023-10-21 13:57:25 +02:00
parent 8ac649e2aa
commit 9956da1567
1 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/unix/fs.c
View File

@ -402,12 +402,18 @@ static ssize_t uv__fs_open(uv_fs_t* req) {
}
static ssize_t uv__fs_read_do(int fd,
const struct iovec* bufs,
unsigned int nbufs,
int64_t off) {
static ssize_t uv__fs_read(uv_fs_t* req) {
const struct iovec* bufs;
unsigned int iovmax;
size_t nbufs;
ssize_t r;
off_t off;
int fd;
fd = req->file;
off = req->off;
bufs = (const struct iovec*) req->bufs;
nbufs = req->nbufs;
iovmax = uv__getiovmax();
if (nbufs > iovmax)
@ -438,17 +444,6 @@ static ssize_t uv__fs_read_do(int fd,
}
#endif
return r;
}
static ssize_t uv__fs_read(uv_fs_t* req) {
const struct iovec* iov;
ssize_t result;
iov = (const struct iovec*) req->bufs;
result = uv__fs_read_do(req->file, iov, req->nbufs, req->off);
/* We don't own the buffer list in the synchronous case. */
if (req->cb != NULL)
if (req->bufs != req->bufsml)
@ -457,7 +452,7 @@ static ssize_t uv__fs_read(uv_fs_t* req) {
req->bufs = NULL;
req->nbufs = 0;
return result;
return r;
}
@ -1091,11 +1086,17 @@ static ssize_t uv__fs_lutime(uv_fs_t* req) {
}
static ssize_t uv__fs_write_do(int fd,
const struct iovec* bufs,
unsigned int nbufs,
int64_t off) {
static ssize_t uv__fs_write(uv_fs_t* req) {
const struct iovec* bufs;
size_t nbufs;
ssize_t r;
off_t off;
int fd;
fd = req->file;
off = req->off;
bufs = (const struct iovec*) req->bufs;
nbufs = req->nbufs;
r = 0;
if (off < 0) {
@ -1114,14 +1115,6 @@ static ssize_t uv__fs_write_do(int fd,
}
static ssize_t uv__fs_write(uv_fs_t* req) {
const struct iovec* iov;
iov = (const struct iovec*) req->bufs;
return uv__fs_write_do(req->file, iov, req->nbufs, req->off);
}
static ssize_t uv__fs_copyfile(uv_fs_t* req) {
uv_fs_t fs_req;
uv_file srcfd;