[tor-commits] [tor/master] Add documentation for the is_socket and error argument of read_to_chunk().

nickm at torproject.org nickm at torproject.org
Tue Dec 18 18:36:43 UTC 2018


commit e982fb1dae6ff0888ae419246578048470dd65b8
Author: Alexander Færøy <ahf at torproject.org>
Date:   Thu Nov 22 17:38:40 2018 +0100

    Add documentation for the is_socket and error argument of read_to_chunk().
    
    See: https://bugs.torproject.org/28179
---
 src/lib/net/buffers_net.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lib/net/buffers_net.c b/src/lib/net/buffers_net.c
index 1b65819db..da7043d5c 100644
--- a/src/lib/net/buffers_net.c
+++ b/src/lib/net/buffers_net.c
@@ -33,8 +33,10 @@
 
 /** Read up to <b>at_most</b> bytes from the file descriptor <b>fd</b> into
  * <b>chunk</b> (which must be on <b>buf</b>). If we get an EOF, set
- * *<b>reached_eof</b> to 1.  Return -1 on error, 0 on eof or blocking,
- * and the number of bytes read otherwise. */
+ * *<b>reached_eof</b> to 1. Uses <b>tor_socket_recv()</b> iff <b>is_socket</b>
+ * is true, otherwise it uses <b>read()</b>.  Return -1 on error (and sets
+ * *<b>error</b> to errno), 0 on eof or blocking, and the number of bytes read
+ * otherwise. */
 static inline int
 read_to_chunk(buf_t *buf, chunk_t *chunk, tor_socket_t fd, size_t at_most,
               int *reached_eof, int *error, bool is_socket)





More information about the tor-commits mailing list