[tor-commits] [torsocks/master] Fix typos in comments

dgoulet at torproject.org dgoulet at torproject.org
Mon Jun 13 21:14:03 UTC 2016


commit 7969b543b292b43cdc6e7d9ad8af4f05cb5989b5
Author: junglefowl <junglefowl at riseup.net>
Date:   Mon Jun 13 17:11:38 2016 -0400

    Fix typos in comments
    
    Signed-off-by: David Goulet <dgoulet at ev0ke.net>
---
 src/common/config-file.c | 4 ++--
 src/common/socks5.c      | 2 +-
 src/common/utils.c       | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common/config-file.c b/src/common/config-file.c
index 05bd480..05ca9cb 100644
--- a/src/common/config-file.c
+++ b/src/common/config-file.c
@@ -115,7 +115,7 @@ error:
 }
 
 /*
- * Parse a single line of from a configuration file and set the value found in
+ * Parse a single line from a configuration file and set the value found in
  * the configuration object.
  *
  * Return 0 on success or else a negative value.
@@ -241,7 +241,7 @@ int conf_file_set_tor_port(const char *port, struct configuration *config)
 	assert(port);
 	assert(config);
 
-	/* Let's avoid a integer overflow here ;). */
+	/* Let's avoid an integer overflow here ;). */
 	_port = strtoul(port, &endptr, 10);
 	if (_port == 0 || _port > 65535) {
 		ret = -EINVAL;
diff --git a/src/common/socks5.c b/src/common/socks5.c
index 962a968..1086deb 100644
--- a/src/common/socks5.c
+++ b/src/common/socks5.c
@@ -45,7 +45,7 @@ wait_on_fd(int fd)
 
 /*
  * Receive data on a given file descriptor using recv(2). This handles partial
- * send and EINTR.
+ * recv and EINTR.
  *
  * Return the number of bytes received or a negative errno error.
  */
diff --git a/src/common/utils.c b/src/common/utils.c
index e477f11..82479af 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -111,10 +111,10 @@ int utils_is_address_ipv6(const char *ip)
 }
 
 /*
- * This routines breaks up input lines into tokens and places these tokens into
- * the array specified by tokens
+ * This routine breaks up input lines into tokens and places these tokens into
+ * the array specified by tokens.
  *
- * Return the number of token plus one set in the given array.
+ * Return the number of tokens plus one set in the given array.
  */
 ATTR_HIDDEN
 int utils_tokenize_ignore_comments(const char *_line, size_t size, char **tokens)



More information about the tor-commits mailing list