From ef9240a7a54592746f4dcd8f49099e70f12aad7d Mon Sep 17 00:00:00 2001 From: Andrew Wood Date: Sun, 19 Apr 2026 21:15:33 +0100 Subject: [PATCH] Add another _ to the internal read/write_repeated functions so they are easier to distinguish from pv__transfer_read/write when searching. --- src/pv/transfer.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/pv/transfer.c b/src/pv/transfer.c index dad322e..6d97186 100644 --- a/src/pv/transfer.c +++ b/src/pv/transfer.c @@ -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));