mirrors/pv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add another _ to the internal read/write_repeated functions so they are easier to distinguish from pv__transfer_read/write when searching.

Browse Source
This commit is contained in:
Andrew Wood
2026-04-19 21:15:33 +01:00
parent b2f44b6724
commit ef9240a7a5
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pv/transfer.c
+11 -11
View File
@@ -115,7 +115,7 @@ static int is_data_ready(int fd_in, /*@null@ */ bool *fd_in_ready, int fd_out, /
*
* Returns the total number of bytes read, or negative on error.
*/
static ssize_t pv__transfer_read_repeated(int fd, char *buf, size_t count)
static ssize_t pv__transfer__read_repeated(int fd, char *buf, size_t count)
{
struct timespec start_time;
ssize_t total_read;
@@ -194,7 +194,7 @@ static ssize_t pv__transfer_read_repeated(int fd, char *buf, size_t count)
*
* Returns the total number of bytes written, or negative on error.
*/
static ssize_t pv__transfer_write_repeated(int fd, char *buf, size_t count, bool sync_after_write)
static ssize_t pv__transfer__write_repeated(int fd, char *buf, size_t count, bool sync_after_write)
{
struct timespec start_time;
ssize_t total_written;
@@ -424,13 +424,13 @@ static int pv__transfer_read(pvstate_t state, int fd, bool *eof_in, bool *eof_ou
}
if (!state->transfer.splice_used) {
nread =
pv__transfer_read_repeated(fd, state->transfer.transfer_buffer + state->transfer.read_position,
bytes_can_read);
pv__transfer__read_repeated(fd, state->transfer.transfer_buffer + state->transfer.read_position,
bytes_can_read);
}
#else
nread =
pv__transfer_read_repeated(fd, state->transfer.transfer_buffer + state->transfer.read_position,
bytes_can_read);
pv__transfer__read_repeated(fd, state->transfer.transfer_buffer + state->transfer.read_position,
bytes_can_read);
#endif /* HAVE_SPLICE */
@@ -755,11 +755,11 @@ static int pv__transfer_write(pvstate_t state, bool *eof_in, bool *eof_out, long
debug("%s", "setting alarm");
#endif /* HAVE_SETITIMER */
debug("%s: %ld %s", "beginning write attempt", (long) (state->transfer.to_write), "bytes");
nwritten = pv__transfer_write_repeated(state->control.output_fd,
state->transfer.transfer_buffer +
state->transfer.write_position,
(size_t) (state->transfer.to_write),
state->control.sync_after_write);
nwritten = pv__transfer__write_repeated(state->control.output_fd,
state->transfer.transfer_buffer +
state->transfer.write_position,
(size_t) (state->transfer.to_write),
state->control.sync_after_write);
if (nwritten < 0) {
write_errno = (int) errno;
debug("%s: %ld: %s", "bytes written", (long) nwritten, strerror(errno));