From c399d22a197c68c60f7ceaad5237f8a112b24abf Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Wed, 9 Jun 2004 03:07:50 +0000 Subject: [PATCH] Renamed read_unbuffered() to readfd_unbuffered() so that it matches writefd_unbuffered(). --- io.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/io.c b/io.c index f34a8994..13f4d3d1 100644 --- a/io.c +++ b/io.c @@ -586,7 +586,7 @@ static void read_loop(int fd, char *buf, size_t len) * * Never returns <= 0. */ -static int read_unbuffered(int fd, char *buf, size_t len) +static int readfd_unbuffered(int fd, char *buf, size_t len) { static size_t remaining; int tag, ret = 0; @@ -603,7 +603,7 @@ static int read_unbuffered(int fd, char *buf, size_t len) bufferSz = 2 * IO_BUFFER_SIZE; buffer = new_array(char, bufferSz); if (!buffer) - out_of_memory("read_unbuffered"); + out_of_memory("readfd_unbuffered"); } remaining = read_timeout(fd, buffer, bufferSz); bufferIdx = 0; @@ -630,7 +630,7 @@ static int read_unbuffered(int fd, char *buf, size_t len) if (!buffer || remaining > bufferSz) { buffer = realloc_array(buffer, char, remaining); if (!buffer) - out_of_memory("read_unbuffered"); + out_of_memory("readfd_unbuffered"); bufferSz = remaining; } read_loop(fd, buffer, remaining); @@ -672,7 +672,7 @@ static void readfd(int fd, char *buffer, size_t N) size_t total = 0; while (total < N) { - ret = read_unbuffered(fd, buffer + total, N-total); + ret = readfd_unbuffered(fd, buffer + total, N-total); total += ret; } @@ -904,9 +904,8 @@ static void mplex_write(int fd, enum msgcode code, char *buf, size_t len) SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len); - if (n > (sizeof buffer - 4)) { + if (n > sizeof buffer - 4) n = sizeof buffer - 4; - } memcpy(&buffer[4], buf, n); writefd_unbuffered(fd, buffer, n+4); -- 2.34.1