[tor-commits] [tor/master] Grammar.

nickm at torproject.org nickm at torproject.org
Tue Jul 5 16:11:38 UTC 2016


commit 8ba4ba0a7492e158640200cb26717abfcc6617b7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 12:10:12 2016 -0400

    Grammar.
    
    I grepped and hand-inspected the "it's" instances, to see if any
    were supposed to be possessive.  While doing that, I found a
    "the the", so I grepped to see if there were any more.
---
 src/common/sandbox.c   |  2 +-
 src/common/workqueue.h |  2 +-
 src/or/keypin.c        |  2 +-
 src/or/policies.c      | 10 ++++++----
 src/or/shared_random.h |  2 +-
 src/or/transports.c    |  2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 94b2fc6..838b267 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -1239,7 +1239,7 @@ prot_strings(scmp_filter_ctx ctx, sandbox_cfg_t* cfg)
 
 /**
  * Auxiliary function used in order to allocate a sandbox_cfg_t element and set
- * it's values according the the parameter list. All elements are initialised
+ * its values according the parameter list. All elements are initialised
  * with the 'prot' field set to false, as the pointer is not protected at this
  * point.
  */
diff --git a/src/common/workqueue.h b/src/common/workqueue.h
index 89282e6..5427676 100644
--- a/src/common/workqueue.h
+++ b/src/common/workqueue.h
@@ -7,7 +7,7 @@
 #include "compat.h"
 
 /** A replyqueue is used to tell the main thread about the outcome of
- * work that we queued for the the workers. */
+ * work that we queued for the workers. */
 typedef struct replyqueue_s replyqueue_t;
 /** A thread-pool manages starting threads and passing work to them. */
 typedef struct threadpool_s threadpool_t;
diff --git a/src/or/keypin.c b/src/or/keypin.c
index 749bc61..335c793 100644
--- a/src/or/keypin.c
+++ b/src/or/keypin.c
@@ -479,7 +479,7 @@ keypin_clear(void)
   HT_CLEAR(rsamap,&the_rsa_map);
 
   if (bad_entries) {
-    log_warn(LD_BUG, "Found %d discrepencies in the the keypin database.",
+    log_warn(LD_BUG, "Found %d discrepencies in the keypin database.",
              bad_entries);
   }
 }
diff --git a/src/or/policies.c b/src/or/policies.c
index 2703d7e..7ddebd6 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -2345,11 +2345,13 @@ policy_summary_reject(smartlist_t *summary,
 }
 
 /** Add a single exit policy item to our summary:
- *  If it is an accept ignore it unless it is for all IP addresses
- *  ("*"), i.e. it's prefixlen/maskbits is 0, else call
+ *
+ *  If it is an accept, ignore it unless it is for all IP addresses
+ *  ("*", i.e. its prefixlen/maskbits is 0). Otherwise call
  *  policy_summary_accept().
- *  If it's a reject ignore it if it is about one of the private
- *  networks, else call policy_summary_reject().
+ *
+ *  If it is a reject, ignore it if it is about one of the private
+ *  networks. Otherwise call policy_summary_reject().
  */
 static void
 policy_summary_add_item(smartlist_t *summary, addr_policy_t *p)
diff --git a/src/or/shared_random.h b/src/or/shared_random.h
index 7c0a3e7..d1ba99d 100644
--- a/src/or/shared_random.h
+++ b/src/or/shared_random.h
@@ -76,7 +76,7 @@ typedef struct sr_commit_t {
 
   /* Commit owner info */
 
-  /* The RSA identity key of the authority and it's base16 representation
+  /* The RSA identity key of the authority and its base16 representation,
    * which includes the NUL terminated byte. */
   char rsa_identity[DIGEST_LEN];
   char rsa_identity_hex[HEX_DIGEST_LEN + 1];
diff --git a/src/or/transports.c b/src/or/transports.c
index 92539b1..c99ff17 100644
--- a/src/or/transports.c
+++ b/src/or/transports.c
@@ -1270,7 +1270,7 @@ get_transport_options_for_server_proxy(const managed_proxy_t *mp)
 
 /** Return the string that tor should place in TOR_PT_SERVER_BINDADDR
  *  while configuring the server managed proxy in <b>mp</b>. The
- *  string is stored in the heap, and it's the the responsibility of
+ *  string is stored in the heap, and it's the responsibility of
  *  the caller to deallocate it after its use. */
 static char *
 get_bindaddr_for_server_proxy(const managed_proxy_t *mp)



More information about the tor-commits mailing list