Attachment 85322 Details for Bug 121490 – file.diff

[patch] file.diff

file.diff (text/plain), 28.29 KB, created by Anatoly Borodin on 2008-03-08 09:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anatoly Borodin

Created: 2008-03-08 09:40:01 UTC

Size: 28.29 KB

patch

obsolete

>diff --git a/contrib/bind9/bin/named/query.c b/contrib/bind9/bin/named/query.c
>index 38eb9a1..43503b4 100644
>--- contrib/bind9/bin/named/query.c.orig
>+++ contrib/bind9/bin/named/query.c
>@@ -3105,7 +3105,7 @@ query_sortlist_order_1element(const dns_rdata_t *rdata, const void *arg) {
> 
> /*
>  * Find the sortlist statement that applies to 'client' and set up
>- * the sortlist info in in client->message appropriately.
>+ * the sortlist info in client->message appropriately.
>  */
> static void
> setup_query_sortlist(ns_client_t *client) {
>diff --git a/contrib/binutils/bfd/aout-arm.c b/contrib/binutils/bfd/aout-arm.c
>index 38ecfab..969a259 100644
>--- contrib/binutils/bfd/aout-arm.c.orig
>+++ contrib/binutils/bfd/aout-arm.c
>@@ -421,7 +421,7 @@ MY_swap_std_reloc_out (abfd, g, natptr)
>   /* If this relocation is relative to a symbol then set the
>      r_index to the symbols index, and the r_extern bit.
> 
>-     Absolute symbols can come in in two ways, either as an offset
>+     Absolute symbols can come in two ways, either as an offset
>      from the abs section, or as a symbol which has an abs value.
>      check for that here
>      */
>diff --git a/contrib/binutils/bfd/aoutx.h b/contrib/binutils/bfd/aoutx.h
>index 3282f87..d22b230 100644
>--- contrib/binutils/bfd/aoutx.h.orig
>+++ contrib/binutils/bfd/aoutx.h
>@@ -2083,7 +2083,7 @@ NAME(aout,swap_std_reloc_out) (abfd, g, natptr)
>   /* If this relocation is relative to a symbol then set the
>      r_index to the symbols index, and the r_extern bit.
> 
>-     Absolute symbols can come in in two ways, either as an offset
>+     Absolute symbols can come in two ways, either as an offset
>      from the abs section, or as a symbol which has an abs value.
>      check for that here.  */
> 
>@@ -2169,7 +2169,7 @@ NAME(aout,swap_ext_reloc_out) (abfd, g, natptr)
>   /* If this relocation is relative to a symbol then set the
>      r_index to the symbols index, and the r_extern bit.
> 
>-     Absolute symbols can come in in two ways, either as an offset
>+     Absolute symbols can come in two ways, either as an offset
>      from the abs section, or as a symbol which has an abs value.
>      check for that here.  */
>   if (bfd_is_abs_section (bfd_get_section (sym)))
>diff --git a/contrib/binutils/include/elf/common.h b/contrib/binutils/include/elf/common.h
>index bf233f6..ebaa8f1 100644
>--- contrib/binutils/include/elf/common.h.orig
>+++ contrib/binutils/include/elf/common.h
>@@ -608,7 +608,7 @@
> #define DF_P1_LAZYLOAD	0x00000001
> #define DF_P1_GROUPPERM	0x00000002
> 
>-/* Flag value in in the DT_FLAGS_1 .dynamic entry.  */
>+/* Flag value in the DT_FLAGS_1 .dynamic entry.  */
> #define DF_1_NOW	0x00000001
> #define DF_1_GLOBAL	0x00000002
> #define DF_1_GROUP	0x00000004
>diff --git a/contrib/cvs/contrib/rcs-to-cvs.sh b/contrib/cvs/contrib/rcs-to-cvs.sh
>index 66a62a9..c90c35a 100644
>--- contrib/cvs/contrib/rcs-to-cvs.sh.orig
>+++ contrib/cvs/contrib/rcs-to-cvs.sh
>@@ -16,7 +16,7 @@
> #
> # Traverses the current directory, ensuring that an
> # identical directory structure exists in the repository directory.  It
>-# then checks the files in in the following manner:
>+# then checks the files in the following manner:
> #
> #		1) If the file doesn't yet exist, check it in as revision 1.1
> #
>diff --git a/contrib/gcc/ChangeLog-1999 b/contrib/gcc/ChangeLog-1999
>index add129d..b0d60c5 100644
>--- contrib/gcc/ChangeLog-1999.orig
>+++ contrib/gcc/ChangeLog-1999
>@@ -19912,7 +19912,7 @@ Thu Feb  4 15:12:41 1999  J"orn Rennecke  <amylaar@cygnus.co.uk>
> 	(cpp_options_init): Don't init things to zero twice.
> 	(cpp_expand_to_buffer): Use memcpy, not a char-by-char loop.
> 	(do_include): Kill excessively verbose #import warning that
>-	snuck back in in the gcc2 merge.
>+	snuck back in the gcc2 merge.
> 	(convert_string): Removed.
> 	(do_line): Rewrite with simple last-name-used cache instead of
> 	private hashtable.
>diff --git a/contrib/gcc/ChangeLog-2000 b/contrib/gcc/ChangeLog-2000
>index 536137b..6e3106b 100644
>--- contrib/gcc/ChangeLog-2000.orig
>+++ contrib/gcc/ChangeLog-2000
>@@ -21693,7 +21693,7 @@ Mon Apr 17 14:59:36 MET DST 2000  Jan Hubicka  <jh@suse.cz>
> 	outputting case vectors.
> 	(ASM_OUTPUT_CASE_END): New, put assembler back into code CSECT.
> 	(ASM_OUTPUT_ADDR_VEC_ELT, ASM_OUTPUT_ADDR_DIFF_ELT): Remove page check,
>-	since vector in in the data CSECT.
>+	since vector in the data CSECT.
> 	(ASM_OUTPUT_REG_POP, ASM_OUTPUT_REG_PUSH): Restore to correct operation.
> 	* i370.md (Many patterns): Put the length in the XL directives.
> 	(movdi): Put back STM and MVC in definition.
>diff --git a/contrib/gcc/configure b/contrib/gcc/configure
>index a248d39..c06ac93 100755
>--- contrib/gcc/configure.orig
>+++ contrib/gcc/configure
>@@ -940,7 +940,7 @@ Optional Packages:
>   --with-slibdir=DIR      shared libraries in DIR [LIBDIR]
>   --with-datarootdir=DIR  Use DIR as the data root [PREFIX/share]
>   --with-docdir=DIR       Install documentation in DIR [DATAROOTDIR]
>-  --with-htmldir=DIR      html documentation in in DIR [DOCDIR]
>+  --with-htmldir=DIR      html documentation in DIR [DOCDIR]
> 
> Some influential environment variables:
>   CC          C compiler command
>diff --git a/contrib/gcc/configure.ac b/contrib/gcc/configure.ac
>index b6c394c..baa8335 100644
>--- contrib/gcc/configure.ac.orig
>+++ contrib/gcc/configure.ac
>@@ -3575,7 +3575,7 @@ docdir='$(datarootdir)')
> AC_SUBST(docdir)
> 
> AC_ARG_WITH(htmldir,
>-[  --with-htmldir=DIR      html documentation in in DIR [[DOCDIR]]],
>+[  --with-htmldir=DIR      html documentation in DIR [[DOCDIR]]],
> htmldir="\${prefix}/$with_htmldir",
> htmldir='$(docdir)')
> AC_SUBST(htmldir)
>diff --git a/contrib/gcc/doc/tree-ssa.texi b/contrib/gcc/doc/tree-ssa.texi
>index 4ed5a33..0bd2caa 100644
>--- contrib/gcc/doc/tree-ssa.texi.orig
>+++ contrib/gcc/doc/tree-ssa.texi
>@@ -1150,7 +1150,7 @@ Some useful functions and macros:
> single use of @code{ssa_var}.
> @item   @code{single_imm_use (ssa_var, use_operand_p *ptr, tree *stmt)} :
> Returns true if there is only a single use of @code{ssa_var}, and also returns
>-the use pointer and statement it occurs in in the second and third parameters.
>+the use pointer and statement it occurs in the second and third parameters.
> @item   @code{num_imm_uses (ssa_var)} : Returns the number of immediate uses of
> @code{ssa_var}. It is better not to use this if possible since it simply
> utilizes a loop to count the uses.
>diff --git a/contrib/gcc/tree-flow-inline.h b/contrib/gcc/tree-flow-inline.h
>index a3bb652..1ad2795 100644
>--- contrib/gcc/tree-flow-inline.h.orig
>+++ contrib/gcc/tree-flow-inline.h
>@@ -625,7 +625,7 @@ is_label_stmt (tree t)
> 
> /* PHI nodes should contain only ssa_names and invariants.  A test
>    for ssa_name is definitely simpler; don't let invalid contents
>-   slip in in the meantime.  */
>+   slip in the meantime.  */
> 
> static inline bool
> phi_ssa_name_p (tree t)
>diff --git a/contrib/gdb/gdb/infcmd.c b/contrib/gdb/gdb/infcmd.c
>index 6e74f4e..67c1242 100644
>--- contrib/gdb/gdb/infcmd.c.orig
>+++ contrib/gdb/gdb/infcmd.c
>@@ -1067,7 +1067,7 @@ print_return_value (int struct_return, struct type *value_type)
>   /* FIXME: 2003-09-27: When returning from a nested inferior function
>      call, it's possible (with no help from the architecture vector)
>      to locate and return/print a "struct return" value.  This is just
>-     a more complicated case of what is already being done in in the
>+     a more complicated case of what is already being done in the
>      inferior function call code.  In fact, when inferior function
>      calls are made async, this will likely be made the norm.  */
>   else if (gdbarch_return_value_p (current_gdbarch))
>diff --git a/contrib/gdb/gdb/infttrace.c b/contrib/gdb/gdb/infttrace.c
>index 3f76edb..46e27cc 100644
>--- contrib/gdb/gdb/infttrace.c.orig
>+++ contrib/gdb/gdb/infttrace.c
>@@ -5088,7 +5088,7 @@ hppa_require_attach (int pid)
>       /* If we were already attached, you'd think that we
>        * would need to start going again--but you'd be wrong,
>        * as the fork-following code is actually in the middle
>-       * of the "resume" routine in in "infrun.c" and so
>+       * of the "resume" routine in "infrun.c" and so
>        * will (almost) immediately do a resume.
>        *
>        * On the other hand, if we are VFORKING, which means
>diff --git a/contrib/gdb/gdb/thread-db.c b/contrib/gdb/gdb/thread-db.c
>index 804f48a..439ed44 100644
>--- contrib/gdb/gdb/thread-db.c.orig
>+++ contrib/gdb/gdb/thread-db.c
>@@ -590,7 +590,7 @@ thread_db_new_objfile (struct objfile *objfile)
>   td_err_e err;
> 
>   /* First time through, report that libthread_db was successfuly
>-     loaded.  Can't print this in in thread_db_load as, at that stage,
>+     loaded.  Can't print this in thread_db_load as, at that stage,
>      the interpreter and it's console haven't started.  The real
>      problem here is that libthread_db is loaded too early - it should
>      only be loaded when there is a program to debug.  */
>diff --git a/contrib/gdb/gdb/top.c b/contrib/gdb/gdb/top.c
>index d6bdfd0..3214093 100644
>--- contrib/gdb/gdb/top.c.orig
>+++ contrib/gdb/gdb/top.c
>@@ -601,7 +601,7 @@ disconnect (int signo)
> }
> #endif /* defined SIGHUP */
> 
>-/* Line number we are currently in in a file which is being sourced.  */
>+/* Line number we are currently in a file which is being sourced.  */
> /* NOTE 1999-04-29: This variable will be static again, once we modify
>    gdb to use the event loop as the default command loop and we merge
>    event-top.c into this file, top.c */
>diff --git a/contrib/gdb/gdb/utils.c b/contrib/gdb/gdb/utils.c
>index 30ccebe..e04777a 100644
>--- contrib/gdb/gdb/utils.c.orig
>+++ contrib/gdb/gdb/utils.c
>@@ -2894,7 +2894,7 @@ gdb_realpath (const char *filename)
>   /* FIXME: cagney/2002-11-13:
> 
>      Method 2a: Use realpath() with a NULL buffer.  Some systems, due
>-     to the problems described in in method 3, have modified their
>+     to the problems described in method 3, have modified their
>      realpath() implementation so that it will allocate a buffer when
>      NULL is passed in.  Before this can be used, though, some sort of
>      configure time test would need to be added.  Otherwize the code
>diff --git a/contrib/groff/contrib/mom/om.tmac b/contrib/groff/contrib/mom/om.tmac
>index 37e9161..a6ce416 100644
>--- contrib/groff/contrib/mom/om.tmac.orig
>+++ contrib/groff/contrib/mom/om.tmac
>@@ -10221,7 +10221,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
> Mom's footnote handling is baroque, to say the least.  There are
> redundancies in a number of the macros involved, as well as some
> registers that probably don't get used anymore.  The baggage is left
>-in in case some new footnote oddity/challenge gets thrown my way.
>+in case some new footnote oddity/challenge gets thrown my way.
> 
> The macros are heavily commented.
> ..
>@@ -11231,7 +11231,7 @@ The macros are heavily commented.
> \# ---------------------------------------------------------------
> \#
> .ig
>-There are some redundancies here; they're left in in case unforeseen
>+There are some redundancies here; they're left in case unforeseen
> footnote situations crop up in the future that might require
> manipulation of them.
> ..
>diff --git a/contrib/libstdc++/ChangeLog-2006 b/contrib/libstdc++/ChangeLog-2006
>index a1b8861..79557fe 100644
>--- contrib/libstdc++/ChangeLog-2006.orig
>+++ contrib/libstdc++/ChangeLog-2006
>@@ -2485,7 +2485,7 @@
> 	* include/tr1/random.tcc: Same.
> 
> 	* include/tr1/hashtable: Move ::Internal to std::tr1::detail and
>-	enclose bits that can actually be internal in in anonymous
>+	enclose bits that can actually be internal in anonymous
> 	namespace.
> 	* include/tr1/unordered_set: Adjust explicit qualifications for
> 	namespace changes.
>diff --git a/contrib/ncurses/doc/html/ncurses-intro.html b/contrib/ncurses/doc/html/ncurses-intro.html
>index e62ead7..1c60fa8 100644
>--- contrib/ncurses/doc/html/ncurses-intro.html.orig
>+++ contrib/ncurses/doc/html/ncurses-intro.html
>@@ -1366,7 +1366,7 @@ on, you'll get an error return (<CODE>E_REQUEST_DENIED</CODE>). <P>
> 
> Each menu has an associated pattern buffer.  The
> <CODE>menu_driver()</CODE> logic tries to accumulate printable ASCII
>-characters passed in in that buffer; when it matches a prefix of an
>+characters passed in that buffer; when it matches a prefix of an
> item name, that item (or the next matching item) is selected.  If
> appending a character yields no new match, that character is deleted
> from the pattern buffer, and <CODE>menu_driver()</CODE> returns
>diff --git a/contrib/ncurses/doc/ncurses-intro.doc b/contrib/ncurses/doc/ncurses-intro.doc
>index 3e607e6..afb71bc 100644
>--- contrib/ncurses/doc/ncurses-intro.doc.orig
>+++ contrib/ncurses/doc/ncurses-intro.doc
>@@ -1226,7 +1226,7 @@ Processing Menu Input
>    get an error return (E_REQUEST_DENIED).
> 
>    Each  menu  has  an associated pattern buffer. The menu_driver() logic
>-   tries  to  accumulate  printable  ASCII  characters  passed in in that
>+   tries  to  accumulate  printable  ASCII  characters  passed in that
>    buffer;  when  it  matches a prefix of an item name, that item (or the
>    next  matching  item)  is selected. If appending a character yields no
>    new  match,  that  character  is  deleted from the pattern buffer, and
>diff --git a/contrib/ncurses/ncurses/tinfo/read_termcap.c b/contrib/ncurses/ncurses/tinfo/read_termcap.c
>index d94d1a4..6882baa 100644
>--- contrib/ncurses/ncurses/tinfo/read_termcap.c.orig
>+++ contrib/ncurses/ncurses/tinfo/read_termcap.c
>@@ -45,7 +45,7 @@
>  *
>  * If USE_GETCAP is enabled, we use what is effectively a copy of the 4.4BSD
>  * getcap code to fetch entries.  There are disadvantages to this; mainly that
>- * getcap(3) does its own resolution, meaning that entries read in in this way
>+ * getcap(3) does its own resolution, meaning that entries read in this way
>  * can't reference the terminfo tree.  The only thing it buys is faster startup
>  * time, getcap(3) is much faster than our tic parser.
>  */
>diff --git a/contrib/ntp/ChangeLog-4.1.0 b/contrib/ntp/ChangeLog-4.1.0
>index b748b80..d1a7373 100644
>--- contrib/ntp/ChangeLog-4.1.0.orig
>+++ contrib/ntp/ChangeLog-4.1.0
>@@ -1450,7 +1450,7 @@
> 	(atom_control): added
> 	(atom_ppsapi): added
> 	* ntpd/ntp_request.c (setclr_flags): SYS_FLAG_PPS cleanup
>-	* ntpd/ntp_refclock.c: stropts.h back in in TTYCLK and
>+	* ntpd/ntp_refclock.c: stropts.h back in TTYCLK and
> 	HAVE_SYS_CLKDEFS_H
> 	Get ntp_syscall if KERNEL_PLL
> 	Define cal_enable
>diff --git a/contrib/ntp/libntp/authkeys.c b/contrib/ntp/libntp/authkeys.c
>index 1c95444..892ce42 100644
>--- contrib/ntp/libntp/authkeys.c.orig
>+++ contrib/ntp/libntp/authkeys.c
>@@ -17,7 +17,7 @@
> #include "ntp_stdlib.h"
> 
> /*
>- * Structure to store keys in in the hash table.
>+ * Structure to store keys in the hash table.
>  */
> struct savekey {
> 	struct savekey *next;
>diff --git a/contrib/openbsm/config/depcomp b/contrib/openbsm/config/depcomp
>index 04701da..d271b99 100644
>--- contrib/openbsm/config/depcomp.orig
>+++ contrib/openbsm/config/depcomp
>@@ -294,7 +294,7 @@ tru64)
>       #
>       # With libtool 1.5 this exception was removed, and libtool now
>       # generates 2 separate objects for the 2 libraries.  These two
>-      # compilations output dependencies in in $dir.libs/$base.o.d and
>+      # compilations output dependencies in $dir.libs/$base.o.d and
>       # in $dir$base.o.d.  We have to check for both files, because
>       # one of the two compilations can be disabled.  We should prefer
>       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
>diff --git a/contrib/openpam/depcomp b/contrib/openpam/depcomp
>index 04701da..d271b99 100755
>--- contrib/openpam/depcomp.orig
>+++ contrib/openpam/depcomp
>@@ -294,7 +294,7 @@ tru64)
>       #
>       # With libtool 1.5 this exception was removed, and libtool now
>       # generates 2 separate objects for the 2 libraries.  These two
>-      # compilations output dependencies in in $dir.libs/$base.o.d and
>+      # compilations output dependencies in $dir.libs/$base.o.d and
>       # in $dir$base.o.d.  We have to check for both files, because
>       # one of the two compilations can be disabled.  We should prefer
>       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
>diff --git a/contrib/sendmail/cf/mailer/mail11.m4 b/contrib/sendmail/cf/mailer/mail11.m4
>index 14bc794..12c46e4 100644
>--- contrib/sendmail/cf/mailer/mail11.m4.orig
>+++ contrib/sendmail/cf/mailer/mail11.m4
>@@ -17,7 +17,7 @@ PUSHDIVERT(-1)
> #
> # For local delivery of DECNET style addresses to the local
> # DECNET node, you will need feature(use_cw_file) and put
>-# your DECNET nodename in in the cw file.
>+# your DECNET nodename in the cw file.
> #
> ifdef(`MAIL11_MAILER_PATH',, `define(`MAIL11_MAILER_PATH', /usr/etc/mail11)')
> _DEFIFNOT(`MAIL11_MAILER_FLAGS', `nsFx')
>diff --git a/contrib/tcp_wrappers/README b/contrib/tcp_wrappers/README
>index 98b6b47..402d4bf 100644
>--- contrib/tcp_wrappers/README.orig
>+++ contrib/tcp_wrappers/README
>@@ -468,7 +468,7 @@ exploited that trusts the client host name or address.
> A long-term solution is to stop using network services that trust the
> client host name or address, and to use data encryption instead.
> 
>-A short-term solution, as outlined in in CERT advisory CA-95:01, is to
>+A short-term solution, as outlined in CERT advisory CA-95:01, is to
> configure network routers so that they discard datagrams from "outside"
> with an "inside" source address. This approach is most fruitful when
> you do not trust any hosts outside your local network.
>diff --git a/contrib/texinfo/doc/info.texi b/contrib/texinfo/doc/info.texi
>index 014e916..2b05de6 100644
>--- contrib/texinfo/doc/info.texi.orig
>+++ contrib/texinfo/doc/info.texi
>@@ -1095,7 +1095,7 @@ It switches to the next node if and when that is necessary.  You
> type @kbd{s} followed by the string to search for, terminated by
> @key{RET}.  To search for the same string again, just @kbd{s} followed
> by @key{RET} will do.  The file's nodes are scanned in the order
>-they are in in the file, which has no necessary relationship to the
>+they are in the file, which has no necessary relationship to the
> order that they may be in the tree structure of menus and @samp{next}
> pointers.  But normally the two orders are not very different.  In any
> case, you can always do a @kbd{b} to find out what node you have
>diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h
>index 88412ab..1e5b2ee 100644
>--- crypto/openssh/config.h.orig
>+++ crypto/openssh/config.h
>@@ -1248,7 +1248,7 @@
> /* Define if you want a different $PATH for the superuser */
> /* #undef SUPERUSER_PATH */
> 
>-/* syslog_r function is safe to use in in a signal handler */
>+/* syslog_r function is safe to use in a signal handler */
> /* #undef SYSLOG_R_SAFE_IN_SIGHAND */
> 
> /* Support passwords > 8 chars */
>diff --git a/crypto/openssh/configure.ac b/crypto/openssh/configure.ac
>index 485bfbd..8c3b2d4 100644
>--- crypto/openssh/configure.ac.orig
>+++ crypto/openssh/configure.ac
>@@ -561,7 +561,7 @@ mips-sony-bsd|mips-sony-newsos4)
> 	AC_DEFINE(HAVE_ATTRIBUTE__BOUNDED__, 1, [OpenBSD's gcc has bounded])
> 	AC_DEFINE(SSH_TUN_OPENBSD, 1, [Open tunnel devices the OpenBSD way])
> 	AC_DEFINE(SYSLOG_R_SAFE_IN_SIGHAND, 1,
>-	    [syslog_r function is safe to use in in a signal handler])
>+	    [syslog_r function is safe to use in a signal handler])
> 	;;
> *-*-solaris*)
> 	if test "x$withval" != "xno" ; then
>diff --git a/crypto/openssl/crypto/asn1/asn1.h b/crypto/openssl/crypto/asn1/asn1.h
>index a60ab04..f5f9752 100644
>--- crypto/openssl/crypto/asn1/asn1.h.orig
>+++ crypto/openssl/crypto/asn1/asn1.h
>@@ -282,7 +282,7 @@ typedef struct ASN1_TLC_st ASN1_TLC;
> /* This is just an opaque pointer */
> typedef struct ASN1_VALUE_st ASN1_VALUE;
> 
>-/* Declare ASN1 functions: the implement macro in in asn1t.h */
>+/* Declare ASN1 functions: the implement macro in asn1t.h */
> 
> #define DECLARE_ASN1_FUNCTIONS(type) DECLARE_ASN1_FUNCTIONS_name(type, type)
> 
>diff --git a/crypto/openssl/demos/state_machine/state_machine.c b/crypto/openssl/demos/state_machine/state_machine.c
>index fef3f3e..dacdbea 100644
>--- crypto/openssl/demos/state_machine/state_machine.c.orig
>+++ crypto/openssl/demos/state_machine/state_machine.c
>@@ -147,7 +147,7 @@ void SSLStateMachine_read_inject(SSLStateMachine *pMachine,
>     {
>     int n=BIO_write(pMachine->pbioRead,aucBuf,nBuf);
>     /* If it turns out this assert fails, then buffer the data here
>-     * and just feed it in in churn instead. Seems to me that it
>+     * and just feed it in churn instead. Seems to me that it
>      * should be guaranteed to succeed, though.
>      */
>     assert(n == nBuf);
>@@ -226,7 +226,7 @@ void SSLStateMachine_write_inject(SSLStateMachine *pMachine,
>     {
>     int n=SSL_write(pMachine->pSSL,aucBuf,nBuf);
>     /* If it turns out this assert fails, then buffer the data here
>-     * and just feed it in in churn instead. Seems to me that it
>+     * and just feed it in churn instead. Seems to me that it
>      * should be guaranteed to succeed, though.
>      */
>     assert(n == nBuf);
>diff --git a/lib/libc/yp/xdryp.c b/lib/libc/yp/xdryp.c
>index 4a1c80f..15d8658 100644
>--- lib/libc/yp/xdryp.c.orig
>+++ lib/libc/yp/xdryp.c
>@@ -42,7 +42,7 @@ extern void *ypresp_data;
>  * I'm leaving the xdr_datum() function in purely for backwards
>  * compatibility. yplib.c doesn't actually use it, but it's listed
>  * in yp_prot.h as being available, so it's probably a good idea to
>- * leave it in in case somebody goes looking for it.
>+ * leave it in case somebody goes looking for it.
>  */
> typedef struct {
> 	char *dptr;
>diff --git a/lib/libc_r/uthread/uthread_sig.c b/lib/libc_r/uthread/uthread_sig.c
>index 0e75946..8f58c63 100644
>--- lib/libc_r/uthread/uthread_sig.c.orig
>+++ lib/libc_r/uthread/uthread_sig.c
>@@ -342,7 +342,7 @@ thread_sig_find(int sig)
> 		 * Enter a loop to look for threads that have the signal
> 		 * unmasked.  POSIX specifies that a thread in a sigwait
> 		 * will get the signal over any other threads.  Second
>-		 * preference will be threads in in a sigsuspend.  Third
>+		 * preference will be threads in a sigsuspend.  Third
> 		 * preference will be the current thread.  If none of the
> 		 * above, then the signal is delivered to the first thread
> 		 * that is found.  Note that if a custom handler is not
>diff --git a/lib/libelf/libelf_convert.m4 b/lib/libelf/libelf_convert.m4
>index fe7f602..5ee83da 100644
>--- lib/libelf/libelf_convert.m4.orig
>+++ lib/libelf/libelf_convert.m4
>@@ -136,7 +136,7 @@ __FBSDID("$FreeBSD: src/lib/libelf/libelf_convert.m4,v 1.3 2007/09/09 02:10:53 j
> 
> /*
>  * Read in various integral values.  The source pointer could be
>- * unaligned.  Values are read in in native byte order.  The source
>+ * unaligned.  Values are read in native byte order.  The source
>  * pointer is incremented appropriately.
>  */
> 
>diff --git a/lib/libkse/thread/thr_sig.c b/lib/libkse/thread/thr_sig.c
>index 7e594f8..870cbda 100644
>--- lib/libkse/thread/thr_sig.c.orig
>+++ lib/libkse/thread/thr_sig.c
>@@ -658,7 +658,7 @@ thr_sig_find(struct kse *curkse, int sig, siginfo_t *info)
> 	 * Enter a loop to look for threads that have the signal
> 	 * unmasked.  POSIX specifies that a thread in a sigwait
> 	 * will get the signal over any other threads.  Second
>-	 * preference will be threads in in a sigsuspend.  Third
>+	 * preference will be threads in a sigsuspend.  Third
> 	 * preference will be the current thread.  If none of the
> 	 * above, then the signal is delivered to the first thread
> 	 * that is found.  Note that if a custom handler is not
>diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c
>index 841822b..935779c 100644
>--- libexec/talkd/announce.c.orig
>+++ libexec/talkd/announce.c
>@@ -91,7 +91,7 @@ announce(CTL_MSG *request, const char *remote_machine)
>  * Build a block of characters containing the message.
>  * It is sent blank filled and in a single block to
>  * try to keep the message in one piece if the recipient
>- * in in vi at the time
>+ * in vi at the time
>  */
> int
> print_mesg(const char *tty, CTL_MSG *request,
>diff --git a/sbin/geom/class/multipath/gmultipath.8 b/sbin/geom/class/multipath/gmultipath.8
>index cfac608..cfb3ee3 100644
>--- sbin/geom/class/multipath/gmultipath.8.orig
>+++ sbin/geom/class/multipath/gmultipath.8
>@@ -59,7 +59,7 @@ command.
> This operation writes a label on the last sector of the underlying
> disk device with a contained name and UUID.
> The UUID guarantees uniqueness
>-in in a shared storage environment but is in general too cumbersome to use.
>+in a shared storage environment but is in general too cumbersome to use.
> The name is what is exported via the device interface.
> .Pp
> The first argument to
>diff --git a/share/man/man7/security.7 b/share/man/man7/security.7
>index d77e944..89b67db 100644
>--- share/man/man7/security.7.orig
>+++ share/man/man7/security.7
>@@ -138,7 +138,7 @@ This gives you a convenient way to detect the attacker.
> Making
> it impossible for an attacker to install a backdoor may actually be detrimental
> to your security because it will not close off the hole the attacker used to
>-break in in the first place.
>+break in the first place.
> .Pp
> Security remedies should always be implemented with a multi-layered
> .Dq onion peel
>diff --git a/sys/boot/ficl/ficl.h b/sys/boot/ficl/ficl.h
>index a9c0b11..e5c2f2f 100644
>--- sys/boot/ficl/ficl.h.orig
>+++ sys/boot/ficl/ficl.h
>@@ -71,7 +71,7 @@
> ** is more like TCL than Forth, which usually expcets to be at the center
> ** of the system, requesting input at its convenience. Each Ficl virtual 
> ** machine can be bound to a different I/O channel, and is independent
>-** of all others in in the same address space except that all virtual
>+** of all others in the same address space except that all virtual
> ** machines share a common dictionary (a sort or open symbol table that
> ** defines all of the elements of the language).
> **
>diff --git a/sys/boot/i386/cdboot/cdboot.s b/sys/boot/i386/cdboot/cdboot.s
>index acde6ff..1a3209f 100644
>--- sys/boot/i386/cdboot/cdboot.s.orig
>+++ sys/boot/i386/cdboot/cdboot.s
>@@ -174,7 +174,7 @@ lookup_path:	push %si			# Save file name pointer
> lookup_found:					# Found a loader file
> #
> # Load the binary into the buffer.  Due to real mode addressing limitations
>-# we have to read it in in 64k chunks.
>+# we have to read it in 64k chunks.
> #
> 		mov DIR_SIZE(%bx),%eax		# Read file length
> 		add $SECTOR_SIZE-1,%eax		# Convert length to sectors
>diff --git a/sys/boot/pc98/cdboot/cdboot.s b/sys/boot/pc98/cdboot/cdboot.s
>index e77f2aa..e423914 100644
>--- sys/boot/pc98/cdboot/cdboot.s.orig
>+++ sys/boot/pc98/cdboot/cdboot.s
>@@ -415,7 +415,7 @@ lookup_path:	push %si			# Save file name pointer
> lookup_found:					# Found a loader file
> #
> # Load the binary into the buffer.  Due to real mode addressing limitations
>-# we have to read it in in 64k chunks.
>+# we have to read it in 64k chunks.
> #
> 		mov %es:DIR_SIZE(%bx),%eax	# Read file length
> 		add $SECTOR_SIZE-1,%eax		# Convert length to sectors
>diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
>index ca25886..2b4b532 100644
>--- sys/dev/ti/if_ti.c.orig
>+++ sys/dev/ti/if_ti.c
>@@ -3685,7 +3685,7 @@ ti_ioctl2(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
> 		 * to the Tigon board you're interested in.  This seems
> 		 * like a not-so-good way to do things, since unless you
> 		 * subsequently specify the unit number of the device
>-		 * you're interested in in every ioctl, you'll only be
>+		 * you're interested in every ioctl, you'll only be
> 		 * able to debug one board at a time.
> 		 */
> 		error = 0;
>diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
>index 8ed59a9..053a1e6 100644
>--- sys/i386/isa/vesa.c.orig
>+++ sys/i386/isa/vesa.c
>@@ -1384,7 +1384,7 @@ get_palette(video_adapter_t *adp, int base, int count,
> 	}
> 	free(r, M_DEVBUF);
> 
>-	/* if error && bits != 6 at this point, we are in in trouble... XXX */
>+	/* if error && bits != 6 at this point, we are in trouble... XXX */
> 	return error;
> }
> 
>diff --git a/usr.bin/checknr/checknr.c b/usr.bin/checknr/checknr.c
>index ae1f847..79cdcef 100644
>--- usr.bin/checknr/checknr.c.orig
>+++ usr.bin/checknr/checknr.c
>@@ -83,7 +83,7 @@ struct stkstr {
> 	int opno;	/* number of opening bracket */
> 	int pl;		/* '+', '-', ' ' for \s, 1 for \f, 0 for .ft */
> 	int parm;	/* parm to size, font, etc */
>-	int lno;	/* line number the thing came in in */
>+	int lno;	/* line number the thing came in */
> } stk[MAXSTK];
> int stktop;
> 
>diff --git a/usr.bin/xlint/lint1/lint1.h b/usr.bin/xlint/lint1/lint1.h
>index 45975e9..df4d41a 100644
>--- usr.bin/xlint/lint1/lint1.h.orig
>+++ usr.bin/xlint/lint1/lint1.h
>@@ -325,7 +325,7 @@ typedef	struct dinfo {
> 	u_int	d_mscl : 1;	/* multiple storage classes */
> 	u_int	d_terr : 1;	/* invalid type combination */
> 	u_int	d_nedecl : 1;	/* 1 if at least a tag is declared */
>-	u_int	d_vararg : 1;	/* ... in in current function decl. */
>+	u_int	d_vararg : 1;	/* ... in current function decl. */
> 	u_int	d_proto : 1;	/* current funct. decl. is prototype */
> 	u_int	d_notyp : 1;	/* set if no type specifier was present */
> 	u_int	d_asm : 1;	/* set if d_ctx == AUTO and asm() present */

Actions: View | Diff

Attachments on bug 121490: 85322