[tor-commits] [tor/master] Remove/fix remaining evbuffer references

nickm at torproject.org nickm at torproject.org
Fri Aug 12 20:11:39 UTC 2016


commit 7b896fe61ef7f8d5dfac453457db54819a6bc72b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 2 14:02:35 2016 -0400

    Remove/fix remaining evbuffer references
---
 src/or/connection.c | 4 ++--
 src/or/control.c    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/or/connection.c b/src/or/connection.c
index ceb2883..68e442d 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -2205,7 +2205,7 @@ connection_send_socks5_connect(connection_t *conn)
   conn->proxy_state = PROXY_SOCKS5_WANT_CONNECT_OK;
 }
 
-/** Wrapper around fetch_from_(buf/evbuffer)_socks_client: see those functions
+/** Wrapper around fetch_from_buf_socks_client: see that functions
  * for documentation of its behavior. */
 static int
 connection_fetch_from_buf_socks_client(connection_t *conn,
@@ -4361,7 +4361,7 @@ connection_flushed_some(connection_t *conn)
 }
 
 /** We just finished flushing bytes to the appropriately low network layer,
- * and there are no more bytes remaining in conn-\>outbuf, conn-\>bev, or
+ * and there are no more bytes remaining in conn-\>outbuf or
  * conn-\>tls to be flushed.
  *
  * This function just passes conn to the connection-specific
diff --git a/src/or/control.c b/src/or/control.c
index b4fead4..c9e1bd9 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -4791,9 +4791,9 @@ is_valid_initial_command(control_connection_t *conn, const char *cmd)
  * interfaces is broken. */
 #define MAX_COMMAND_LINE_LENGTH (1024*1024)
 
-/** Wrapper around peek_(evbuffer|buf)_has_control0 command: presents the same
- * interface as those underlying functions, but takes a connection_t intead of
- * an evbuffer or a buf_t.
+/** Wrapper around peek_buf_has_control0 command: presents the same
+ * interface as that underlying functions, but takes a connection_t intead of
+ * a buf_t.
  */
 static int
 peek_connection_has_control0_command(connection_t *conn)





More information about the tor-commits mailing list