X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=54eddb3c46445ff625dfc1becb6bf7c5bfa75311;hp=bdba2765a0fe3c6be12a9b32679bd79c267c6eb3;hb=e908ea4515b36e37f70bfffde83f43ffc26d9009;hpb=8a63543fdfbd3b5d00e4afecfbc397795a49ed04

diff --git a/fd.c b/fd.c
index bdba2765..54eddb3c 100644
--- a/fd.c
+++ b/fd.c
@@ -49,10 +49,6 @@ int write_all(int fd, const char *buf, size_t *len)
  * \param fd The file descriptor.
  * \param buf the buffer to write.
  * \param len the number of bytes of \a buf.
- * \param max_bytes_per_write Do not write more than that many bytes at once.
- *
- * If \a max_bytes_per_write is non-zero, do not send more than that many bytes
- * per write().
  *
  * EAGAIN is not considered an error condition.  For example CCID3 has a
  * sending wait queue which fills up and is emptied asynchronously. The EAGAIN
@@ -61,8 +57,7 @@ int write_all(int fd, const char *buf, size_t *len)
  *
  * \return Negative on errors, number of bytes written else.
  */
-int write_nonblock(int fd, const char *buf, size_t len,
-		size_t max_bytes_per_write)
+int write_nonblock(int fd, const char *buf, size_t len)
 {
 	size_t written = 0;
 	int ret = 0;
@@ -70,8 +65,6 @@ int write_nonblock(int fd, const char *buf, size_t len,
 	while (written < len) {
 		size_t num = len - written;
 
-		if (max_bytes_per_write && max_bytes_per_write < num)
-			num = max_bytes_per_write;
 		ret = write(fd, buf + written, num);
 		if (ret < 0 && errno == EAGAIN)
 			return written;
@@ -104,7 +97,7 @@ int write_nonblock(int fd, const char *buf, size_t len,
  * In any case, \a num_bytes contains the number of bytes that have been
  * successfully read from \a fd (zero if the first readv() call failed with
  * EAGAIN). Note that even if the function returns negative, some data might
- * have been read before the error occured. In this case \a num_bytes is
+ * have been read before the error occurred. In this case \a num_bytes is
  * positive.
  *
  * \sa \ref write_nonblock(), read(2), readv(2).
@@ -183,6 +176,7 @@ int read_nonblock(int fd, void *buf, size_t sz, fd_set *rfds, size_t *num_bytes)
  * \param fd The file descriptor to receive from.
  * \param pattern The expected pattern.
  * \param bufsize The size of the internal buffer.
+ * \param rfds Passed to read_nonblock().
  *
  * This function tries to read at most \a bufsize bytes from the non-blocking
  * file descriptor \a fd. If at least \p strlen(\a pattern) bytes have been