From owner-svn-src-stable-7@FreeBSD.ORG Sat Mar 5 04:11:07 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27A01106566C; Sat, 5 Mar 2011 04:11:07 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 112CB8FC1A; Sat, 5 Mar 2011 04:11:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p254B6J1004527; Sat, 5 Mar 2011 04:11:06 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p254B6FW004516; Sat, 5 Mar 2011 04:11:06 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201103050411.p254B6FW004516@svn.freebsd.org> From: Bruce Cran Date: Sat, 5 Mar 2011 04:11:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219296 - in stable/7: lib/libc/yp lib/libkse/thread libexec/talkd share/man/man7 sys/boot/i386/cdboot sys/boot/pc98/cdboot sys/dev/ti sys/i386/isa usr.bin/checknr usr.bin/xlint/lint1 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Mar 2011 04:11:07 -0000 Author: brucec Date: Sat Mar 5 04:11:06 2011 New Revision: 219296 URL: http://svn.freebsd.org/changeset/base/219296 Log: MFC r177626, r219096, r219126: Fix some "in in" typos in comments. PR: 121490 Submitted by: Anatoly Borodin Modified: stable/7/lib/libc/yp/xdryp.c stable/7/lib/libkse/thread/thr_sig.c stable/7/libexec/talkd/announce.c stable/7/share/man/man7/security.7 stable/7/sys/boot/i386/cdboot/cdboot.s stable/7/sys/boot/pc98/cdboot/cdboot.s stable/7/sys/dev/ti/if_ti.c stable/7/sys/i386/isa/vesa.c stable/7/usr.bin/checknr/checknr.c stable/7/usr.bin/xlint/lint1/lint1.h Directory Properties: stable/7/lib/libc/ (props changed) stable/7/lib/libc/stdtime/ (props changed) stable/7/lib/libkse/ (props changed) stable/7/libexec/talkd/ (props changed) stable/7/share/man/man7/ (props changed) stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/usr.bin/checknr/ (props changed) stable/7/usr.bin/xlint/ (props changed) Modified: stable/7/lib/libc/yp/xdryp.c ============================================================================== --- stable/7/lib/libc/yp/xdryp.c Sat Mar 5 04:08:07 2011 (r219295) +++ stable/7/lib/libc/yp/xdryp.c Sat Mar 5 04:11:06 2011 (r219296) @@ -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; Modified: stable/7/lib/libkse/thread/thr_sig.c ============================================================================== --- stable/7/lib/libkse/thread/thr_sig.c Sat Mar 5 04:08:07 2011 (r219295) +++ stable/7/lib/libkse/thread/thr_sig.c Sat Mar 5 04:11:06 2011 (r219296) @@ -663,7 +663,7 @@ thr_sig_find(struct kse *curkse, 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 Modified: stable/7/libexec/talkd/announce.c ============================================================================== --- stable/7/libexec/talkd/announce.c Sat Mar 5 04:08:07 2011 (r219295) +++ stable/7/libexec/talkd/announce.c Sat Mar 5 04:11:06 2011 (r219296) @@ -91,7 +91,7 @@ announce(CTL_MSG *request, const char *r * 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, Modified: stable/7/share/man/man7/security.7 ============================================================================== --- stable/7/share/man/man7/security.7 Sat Mar 5 04:08:07 2011 (r219295) +++ stable/7/share/man/man7/security.7 Sat Mar 5 04:11:06 2011 (r219296) @@ -138,7 +138,7 @@ This gives you a convenient way to detec 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 originally. .Pp Security remedies should always be implemented with a multi-layered .Dq onion peel Modified: stable/7/sys/boot/i386/cdboot/cdboot.s ============================================================================== --- stable/7/sys/boot/i386/cdboot/cdboot.s Sat Mar 5 04:08:07 2011 (r219295) +++ stable/7/sys/boot/i386/cdboot/cdboot.s Sat Mar 5 04:11:06 2011 (r219296) @@ -174,7 +174,7 @@ lookup_path: push %si # Save file name 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 Modified: stable/7/sys/boot/pc98/cdboot/cdboot.s ============================================================================== --- stable/7/sys/boot/pc98/cdboot/cdboot.s Sat Mar 5 04:08:07 2011 (r219295) +++ stable/7/sys/boot/pc98/cdboot/cdboot.s Sat Mar 5 04:11:06 2011 (r219296) @@ -415,7 +415,7 @@ lookup_path: push %si # Save file name 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 Modified: stable/7/sys/dev/ti/if_ti.c ============================================================================== --- stable/7/sys/dev/ti/if_ti.c Sat Mar 5 04:08:07 2011 (r219295) +++ stable/7/sys/dev/ti/if_ti.c Sat Mar 5 04:11:06 2011 (r219296) @@ -3685,7 +3685,7 @@ ti_ioctl2(struct cdev *dev, u_long cmd, * 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; Modified: stable/7/sys/i386/isa/vesa.c ============================================================================== --- stable/7/sys/i386/isa/vesa.c Sat Mar 5 04:08:07 2011 (r219295) +++ stable/7/sys/i386/isa/vesa.c Sat Mar 5 04:11:06 2011 (r219296) @@ -1392,7 +1392,7 @@ get_palette(video_adapter_t *adp, int ba } 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; } Modified: stable/7/usr.bin/checknr/checknr.c ============================================================================== --- stable/7/usr.bin/checknr/checknr.c Sat Mar 5 04:08:07 2011 (r219295) +++ stable/7/usr.bin/checknr/checknr.c Sat Mar 5 04:11:06 2011 (r219296) @@ -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 */ } stk[MAXSTK]; int stktop; Modified: stable/7/usr.bin/xlint/lint1/lint1.h ============================================================================== --- stable/7/usr.bin/xlint/lint1/lint1.h Sat Mar 5 04:08:07 2011 (r219295) +++ stable/7/usr.bin/xlint/lint1/lint1.h Sat Mar 5 04:11:06 2011 (r219296) @@ -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 */