c/libuv
1
0
Fork 0
mirror of https://github.com/libuv/libuv synced 2025-03-28 21:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

unix: rename variable for consistency

Browse Source 
uv__fs_write_do() calls it `r` so call it that in `uv__fs_read_do()`
too.
This commit is contained in:
Ben Noordhuis 2023-10-21 13:57:25 +02:00
parent 8d69f256d1
commit 8ac649e2aa
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/unix/fs.c
View File

@ -407,28 +407,28 @@ static ssize_t uv__fs_read_do(int fd,
unsigned int nbufs,
int64_t off) {
unsigned int iovmax;
ssize_t result;
ssize_t r;
iovmax = uv__getiovmax();
if (nbufs > iovmax)
nbufs = iovmax;
result = 0;
r = 0;
if (off < 0) {
if (nbufs == 1)
result = read(fd, bufs->iov_base, bufs->iov_len);
r = read(fd, bufs->iov_base, bufs->iov_len);
else if (nbufs > 1)
result = readv(fd, bufs, nbufs);
r = readv(fd, bufs, nbufs);
} else {
if (nbufs == 1)
result = pread(fd, bufs->iov_base, bufs->iov_len, off);
r = pread(fd, bufs->iov_base, bufs->iov_len, off);
else if (nbufs > 1)
result = preadv(fd, bufs, nbufs, off);
r = preadv(fd, bufs, nbufs, off);
}
#ifdef __PASE__
/* PASE returns EOPNOTSUPP when reading a directory, convert to EISDIR */
if (result == -1 && errno == EOPNOTSUPP) {
if (r == -1 && errno == EOPNOTSUPP) {
struct stat buf;
ssize_t rc;
rc = uv__fstat(fd, &buf);
@ -438,7 +438,7 @@ static ssize_t uv__fs_read_do(int fd,
}
#endif
return result;
return r;
}