From 3fb1637c9265cc593973326ae193783413f68699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tatuya=20JINMEI=20=E7=A5=9E=E6=98=8E=E9=81=94=E5=93=89?=
 <jinmei@isc.org>
Date: Mon, 5 Jan 2009 23:20:22 +0000
Subject: [PATCH] trivial comment cleanups (RT#19118)

---
 bin/named/log.c                  | 4 ++--
 bin/named/xfrout.c               | 4 ++--
 lib/dns/diff.c                   | 4 ++--
 lib/dns/include/dns/db.h         | 4 ++--
 lib/dns/include/dns/validator.h  | 4 ++--
 lib/dns/include/dns/view.h       | 4 ++--
 lib/dns/include/dns/zone.h       | 4 ++--
 lib/dns/resolver.c               | 4 ++--
 lib/dns/validator.c              | 4 ++--
 lib/isc/include/isc/log.h        | 4 ++--
 lib/isc/log.c                    | 4 ++--
 lib/isc/unix/include/isc/time.h  | 4 ++--
 lib/isc/win32/include/isc/time.h | 4 ++--
 lib/isc/win32/socket.c           | 6 +++---
 14 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/bin/named/log.c b/bin/named/log.c
index fdb4e0cb94..f0a3899b55 100644
--- a/bin/named/log.c
+++ b/bin/named/log.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.46 2007/06/19 23:46:59 tbox Exp $ */
+/* $Id: log.c,v 1.47 2009/01/05 23:20:21 jinmei Exp $ */
 
 /*! \file */
 
@@ -120,7 +120,7 @@ ns_log_setdefaultchannels(isc_logconfig_t *lcfg) {
 	/*
 	 * By default, the logging library makes "default_debug" log to
 	 * stderr.  In BIND, we want to override this and log to named.run
-	 * instead, unless the the -g option was given.
+	 * instead, unless the -g option was given.
 	 */
 	if (! ns_g_logstderr) {
 		destination.file.stream = NULL;
diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c
index 55b19f0c7b..c24b976452 100644
--- a/bin/named/xfrout.c
+++ b/bin/named/xfrout.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrout.c,v 1.131 2008/10/29 02:54:20 marka Exp $ */
+/* $Id: xfrout.c,v 1.132 2009/01/05 23:20:21 jinmei Exp $ */
 
 #include <config.h>
 
@@ -1208,7 +1208,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
 	}
 
 	/*
-	 * Bracket the the data stream with SOAs.
+	 * Bracket the data stream with SOAs.
 	 */
 	CHECK(soa_rrstream_create(mctx, db, ver, &soa_stream));
 	CHECK(compound_rrstream_create(mctx, &soa_stream, &data_stream,
diff --git a/lib/dns/diff.c b/lib/dns/diff.c
index 850ca91c4d..1fa20cc01c 100644
--- a/lib/dns/diff.c
+++ b/lib/dns/diff.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: diff.c,v 1.18 2008/09/24 02:46:22 marka Exp $ */
+/* $Id: diff.c,v 1.19 2009/01/05 23:20:21 jinmei Exp $ */
 
 /*! \file */
 
@@ -533,7 +533,7 @@ dns_diff_sort(dns_diff_t *diff, dns_diff_compare_func *compare) {
 
 /*
  * Create an rdataset containing the single RR of the given
- * tuple.  The caller must allocate the the rdata, rdataset and
+ * tuple.  The caller must allocate the rdata, rdataset and
  * an rdatalist structure for it to refer to.
  */
 
diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 8e2246339b..4c128e169f 100644
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db.h,v 1.93 2008/09/24 02:46:22 marka Exp $ */
+/* $Id: db.h,v 1.94 2009/01/05 23:20:22 jinmei Exp $ */
 
 #ifndef DNS_DB_H
 #define DNS_DB_H 1
@@ -1329,7 +1329,7 @@ dns_db_register(const char *name, dns_dbcreatefunc_t create, void *driverarg,
 void
 dns_db_unregister(dns_dbimplementation_t **dbimp);
 /*%<
- * Remove a database implementation from the the list of supported
+ * Remove a database implementation from the list of supported
  * implementations.  No databases of this type can be active when this
  * is called.
  *
diff --git a/lib/dns/include/dns/validator.h b/lib/dns/include/dns/validator.h
index 0a2417b8ed..2baa8578c9 100644
--- a/lib/dns/include/dns/validator.h
+++ b/lib/dns/include/dns/validator.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.h,v 1.41 2008/09/25 04:02:39 tbox Exp $ */
+/* $Id: validator.h,v 1.42 2009/01/05 23:20:22 jinmei Exp $ */
 
 #ifndef DNS_VALIDATOR_H
 #define DNS_VALIDATOR_H 1
@@ -74,7 +74,7 @@
  * caller so that they may be freed.
  *
  * If the RESULT is ISC_R_SUCCESS and the answer is secure then
- * proofs[] will contain the the names of the NSEC records that hold the
+ * proofs[] will contain the names of the NSEC records that hold the
  * various proofs.  Note the same name may appear multiple times.
  */
 typedef struct dns_validatorevent {
diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index 8329523f84..221223ad4c 100644
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: view.h,v 1.111 2008/05/21 23:17:21 each Exp $ */
+/* $Id: view.h,v 1.112 2009/01/05 23:20:22 jinmei Exp $ */
 
 #ifndef DNS_VIEW_H
 #define DNS_VIEW_H 1
@@ -794,7 +794,7 @@ dns_view_isdelegationonly(dns_view_t *view, dns_name_t *name);
  *\li	'name' is valid.
  *
  * Returns:
- *\li	#ISC_TRUE if the name is is the table.
+ *\li	#ISC_TRUE if the name is the table.
  *\li	#ISC_FALSE othewise.
  */
 
diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index c6f4444143..eaf3f7e980 100644
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.h,v 1.160 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: zone.h,v 1.161 2009/01/05 23:20:22 jinmei Exp $ */
 
 #ifndef DNS_ZONE_H
 #define DNS_ZONE_H 1
@@ -1406,7 +1406,7 @@ dns_zonemgr_settransfersin(dns_zonemgr_t *zmgr, isc_uint32_t value);
 isc_uint32_t
 dns_zonemgr_getttransfersin(dns_zonemgr_t *zmgr);
 /*%<
- *	Return the the maximum number of simultaneous transfers in allowed.
+ *	Return the maximum number of simultaneous transfers in allowed.
  *
  * Requires:
  *\li	'zmgr' to be a valid zone manager.
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 9d1c2febb6..471a677d2a 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.384 2008/11/07 00:52:34 marka Exp $ */
+/* $Id: resolver.c,v 1.385 2009/01/05 23:20:21 jinmei Exp $ */
 
 /*! \file */
 
@@ -5343,7 +5343,7 @@ answer_response(fetchctx_t *fctx) {
 					 */
 					if (found_dname) {
 						/*
-						 * Copy the the dname into the
+						 * Copy the dname into the
 						 * qname fixed name.
 						 *
 						 * Although we check for
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 39c17d573d..1a1f39af1b 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.164 2008/11/14 23:47:33 tbox Exp $ */
+/* $Id: validator.c,v 1.165 2009/01/05 23:20:22 jinmei Exp $ */
 
 #include <config.h>
 
@@ -1522,7 +1522,7 @@ get_key(dns_validator_t *val, dns_rdata_rrsig_t *siginfo) {
 	 * Is the signer name appropriate for this signature?
 	 *
 	 * The signer name must be at the same level as the owner name
-	 * or closer to the the DNS root.
+	 * or closer to the DNS root.
 	 */
 	namereln = dns_name_fullcompare(val->event->name, &siginfo->signer,
 					&order, &nlabels);
diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h
index deb64346e1..c0bd1207a5 100644
--- a/lib/isc/include/isc/log.h
+++ b/lib/isc/include/isc/log.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.h,v 1.54 2007/06/19 23:47:18 tbox Exp $ */
+/* $Id: log.h,v 1.55 2009/01/05 23:20:22 jinmei Exp $ */
 
 #ifndef ISC_LOG_H
 #define ISC_LOG_H 1
@@ -633,7 +633,7 @@ isc_log_vwrite1(isc_log_t *lctx, isc_logcategory_t *category,
 ISC_FORMAT_PRINTF(5, 0);
 
 /*%
- * These are four internationalized versions of the the isc_log_[v]write[1]
+ * These are four internationalized versions of the isc_log_[v]write[1]
  * functions.  
  *
  * The only difference is that they take arguments for a message
diff --git a/lib/isc/log.c b/lib/isc/log.c
index 802f302eb4..09f079eea5 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.94 2007/06/19 23:47:17 tbox Exp $ */
+/* $Id: log.c,v 1.95 2009/01/05 23:20:22 jinmei Exp $ */
 
 /*! \file
  * \author  Principal Authors: DCL */
@@ -128,7 +128,7 @@ struct isc_logconfig {
  * This isc_log structure provides the context for the isc_log functions.
  * The log context locks itself in isc_log_doit, the internal backend to
  * isc_log_write.  The locking is necessary both to provide exclusive access
- * to the the buffer into which the message is formatted and to guard against
+ * to the buffer into which the message is formatted and to guard against
  * competing threads trying to write to the same syslog resource.  (On
  * some systems, such as BSD/OS, stdio is thread safe but syslog is not.)
  * Unfortunately, the lock cannot guard against a _different_ logging
diff --git a/lib/isc/unix/include/isc/time.h b/lib/isc/unix/include/isc/time.h
index c65ce9d2d3..4b7dfb74a8 100644
--- a/lib/isc/unix/include/isc/time.h
+++ b/lib/isc/unix/include/isc/time.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.h,v 1.38 2008/09/08 23:47:10 tbox Exp $ */
+/* $Id: time.h,v 1.39 2009/01/05 23:20:22 jinmei Exp $ */
 
 #ifndef ISC_TIME_H
 #define ISC_TIME_H 1
@@ -276,7 +276,7 @@ isc_time_nanoseconds(const isc_time_t *t);
  * Return the number of nanoseconds stored in a time structure.
  *
  * Notes:
- *\li	This is the number of nanoseconds in excess of the the number
+ *\li	This is the number of nanoseconds in excess of the number
  *	of seconds since the epoch; it will always be less than one
  *	full second.
  *
diff --git a/lib/isc/win32/include/isc/time.h b/lib/isc/win32/include/isc/time.h
index af0cddb183..0c4d52cd8e 100644
--- a/lib/isc/win32/include/isc/time.h
+++ b/lib/isc/win32/include/isc/time.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.h,v 1.33 2008/09/08 23:47:10 tbox Exp $ */
+/* $Id: time.h,v 1.34 2009/01/05 23:20:22 jinmei Exp $ */
 
 #ifndef ISC_TIME_H
 #define ISC_TIME_H 1
@@ -230,7 +230,7 @@ isc_time_nanoseconds(const isc_time_t *t);
  * Return the number of nanoseconds stored in a time structure.
  *
  * Notes:
- *	This is the number of nanoseconds in excess of the the number
+ *	This is the number of nanoseconds in excess of the number
  *	of seconds since the epoch; it will always be less than one
  *	full second.
  *
diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 082fb7d416..69b6b275cd 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.70 2008/09/16 17:19:01 explorer Exp $ */
+/* $Id: socket.c,v 1.71 2009/01/05 23:20:22 jinmei Exp $ */
 
 /* This code uses functions which are only available on Server 2003 and
  * higher, and Windows XP and higher.
@@ -574,7 +574,7 @@ iocompletionport_update(isc_socket_t *sock) {
  * Routine to cleanup and then close the socket.
  * Only close the socket here if it is NOT associated
  * with an event, otherwise the WSAWaitForMultipleEvents
- * may fail due to the fact that the the Wait should not
+ * may fail due to the fact that the Wait should not
  * be running while closing an event or a socket.
  * The socket is locked before calling this function
  */
@@ -1924,7 +1924,7 @@ send_connectdone_event(isc_socket_t *sock, isc_socket_connev_t **cdev) {
  * the done event we want to send.  If the list is empty, this is a no-op,
  * so just close the new connection, unlock, and return.
  *
- * Note the the socket is locked before entering here
+ * Note the socket is locked before entering here
  */
 static void
 internal_accept(isc_socket_t *sock, IoCompletionInfo *lpo, int accept_errno) {