[or-cvs] [tor/master] Remove duplicate words and a duplicate newline.
Nick Mathewson
nickm at seul.org
Fri Dec 18 19:17:46 UTC 2009
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Fri, 18 Dec 2009 12:55:05 +0100
Subject: Remove duplicate words and a duplicate newline.
Commit: f80672d74786c05a776fdbd8581d553c98d75e5a
---
src/common/compat_libevent.c | 2 +-
src/common/util.c | 6 +++---
src/or/connection.c | 2 +-
src/or/connection_or.c | 2 +-
src/or/control.c | 2 +-
src/or/router.c | 2 +-
src/or/routerlist.c | 2 +-
src/or/routerparse.c | 2 +-
src/test/test_util.c | 1 -
9 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c
index 32c6d4c..dcf51cb 100644
--- a/src/common/compat_libevent.c
+++ b/src/common/compat_libevent.c
@@ -26,7 +26,7 @@
/** A number representing a version of Libevent.
This is a 4-byte number, with the first three bytes representing the
- major, minor, and patchlevel respectively of the the library. The fourth
+ major, minor, and patchlevel respectively of the library. The fourth
byte is unused.
This is equivalent to the format of LIBEVENT_VERSION_NUMBER on Libevent
diff --git a/src/common/util.c b/src/common/util.c
index 6177a3e..a15af7e 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -682,7 +682,7 @@ find_whitespace_eos(const char *s, const char *eos)
return s;
}
-/** Return the the first occurrence of <b>needle</b> in <b>haystack</b> that
+/** Return the first occurrence of <b>needle</b> in <b>haystack</b> that
* occurs at the start of a line (that is, at the beginning of <b>haystack</b>
* or immediately after a newline). Return NULL if no such string is found.
*/
@@ -1237,7 +1237,7 @@ format_rfc1123_time(char *buf, time_t t)
memcpy(buf+8, MONTH_NAMES[tm.tm_mon], 3);
}
-/** Parse the the RFC1123 encoding of some time (in GMT) from <b>buf</b>,
+/** Parse the RFC1123 encoding of some time (in GMT) from <b>buf</b>,
* and store the result in *<b>t</b>.
*
* Return 0 on success, -1 on failure.
@@ -1778,7 +1778,7 @@ write_str_to_file(const char *fname, const char *str, int bin)
}
/** Represents a file that we're writing to, with support for atomic commit:
- * we can write into a a temporary file, and either remove the file on
+ * we can write into a temporary file, and either remove the file on
* failure, or replace the original file on success. */
struct open_file_t {
char *tempname; /**< Name of the temporary file. */
diff --git a/src/or/connection.c b/src/or/connection.c
index fdbe867..8de7ad9 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1375,7 +1375,7 @@ connection_proxy_connect(connection_t *conn, int type)
/* Send a SOCKS4 connect request with empty user id */
if (tor_addr_family(&conn->addr) != AF_INET) {
- log_warn(LD_NET, "SOCKS4 client is incompatible with with IPv6");
+ log_warn(LD_NET, "SOCKS4 client is incompatible with IPv6");
return -1;
}
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 60c5c7f..84023f5 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -886,7 +886,7 @@ connection_or_nonopen_was_started_here(or_connection_t *conn)
* return -1 if he is lying, broken, or otherwise something is wrong.
*
* If we initiated this connection (<b>started_here</b> is true), make sure
- * the other side sent sent a correctly formed certificate. If I initiated the
+ * the other side sent a correctly formed certificate. If I initiated the
* connection, make sure it's the right guy.
*
* Otherwise (if we _didn't_ initiate this connection), it's okay for
diff --git a/src/or/control.c b/src/or/control.c
index d3ed858..be1e921 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -279,7 +279,7 @@ connection_write_str_to_buf(const char *s, control_connection_t *conn)
/** Given a <b>len</b>-character string in <b>data</b>, made of lines
* terminated by CRLF, allocate a new string in *<b>out</b>, and copy the
* contents of <b>data</b> into *<b>out</b>, adding a period before any period
- * that that appears at the start of a line, and adding a period-CRLF line at
+ * that appears at the start of a line, and adding a period-CRLF line at
* the end. Replace all LF characters sequences with CRLF. Return the number
* of bytes in *<b>out</b>.
*/
diff --git a/src/or/router.c b/src/or/router.c
index 7362e60..e14f237 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1660,7 +1660,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
return -1;
}
- /* PEM-encode the identity key key */
+ /* PEM-encode the identity key */
if (crypto_pk_write_public_key_to_string(router->identity_pkey,
&identity_pkey,&identity_pkeylen)<0) {
log_warn(LD_BUG,"write identity_pkey to string failed!");
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 7275e1d..133e193 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3937,7 +3937,7 @@ client_would_use_router(routerstatus_t *rs, time_t now, or_options_t *options)
* this number per server. */
#define MIN_DL_PER_REQUEST 4
/** To prevent a single screwy cache from confusing us by selective reply,
- * try to split our requests into at least this this many requests. */
+ * try to split our requests into at least this many requests. */
#define MIN_REQUESTS 3
/** If we want fewer than this many descriptors, wait until we
* want more, or until MAX_CLIENT_INTERVAL_WITHOUT_REQUEST has
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index bc59a62..13dc10c 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2928,7 +2928,7 @@ networkstatus_parse_detached_signatures(const char *s, const char *eos)
}
if (base16_decode(digests->d[alg], DIGEST256_LEN,
hexdigest, strlen(hexdigest)) < 0) {
- log_warn(LD_DIR, "Bad encoding on on consensus-digest in detached "
+ log_warn(LD_DIR, "Bad encoding on consensus-digest in detached "
"networkstatus signatures");
goto err;
}
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 3ed6a7a..ba0f8cd 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -1049,7 +1049,6 @@ test_util_find_str_at_start_of_line(void *ptr)
;
}
-
#define UTIL_LEGACY(name) \
{ #name, legacy_test_helper, 0, &legacy_setup, test_util_ ## name }
--
1.5.6.5
More information about the tor-commits
mailing list