Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Feb 2011 19:07:24 -0800
From:      Rob Farmer <rfarmer@predatorlabs.net>
To:        Bruce Cran <brucec@freebsd.org>
Cc:        svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org
Subject:   Re: svn commit: r219096 - in head: lib/libc/yp lib/libelf share/man/man7 sys/boot/i386/cdboot sys/boot/pc98/cdboot usr.bin/checknr
Message-ID:  <AANLkTiktZ-hdH=u4sHZ4RevCix2SASYPmGSRZa5PFxgf@mail.gmail.com>
In-Reply-To: <201102281003.p1SA3mfl032937@svn.freebsd.org>
References:  <201102281003.p1SA3mfl032937@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Feb 28, 2011 at 2:03 AM, Bruce Cran <brucec@freebsd.org> wrote:
> Author: brucec
> Date: Mon Feb 28 10:03:48 2011
> New Revision: 219096
> URL: http://svn.freebsd.org/changeset/base/219096
>
> Log:
> =A0Revert some of r177626. "in in" is valid in certain sentences.

I disagree. "in in" (or any doubled word) looks awkward in print and
should be avoided. Even if its grammatically correct, its a style
problem because the reader has to do a double take and starts to
wonder about the quality of the writing. With the exception of the
security manpage, where "break in originally" or similar would work,
these are all unnecessary verbosity and should be cut.

>
> =A0PR: =A0 =A0 =A0 =A0 =A0 121490
> =A0MFC after: =A0 =A03 days
>
> Modified:
> =A0head/lib/libc/yp/xdryp.c
> =A0head/lib/libelf/libelf_convert.m4
> =A0head/share/man/man7/security.7
> =A0head/sys/boot/i386/cdboot/cdboot.s
> =A0head/sys/boot/pc98/cdboot/cdboot.s
> =A0head/usr.bin/checknr/checknr.c
>
> Modified: head/lib/libc/yp/xdryp.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/lib/libc/yp/xdryp.c =A0 =A0Mon Feb 28 09:11:46 2011 =A0 =A0 =A0 =
=A0(r219095)
> +++ head/lib/libc/yp/xdryp.c =A0 =A0Mon Feb 28 10:03:48 2011 =A0 =A0 =A0 =
=A0(r219096)
> @@ -42,7 +42,7 @@ extern void *ypresp_data;
> =A0* I'm leaving the xdr_datum() function in purely for backwards
> =A0* compatibility. yplib.c doesn't actually use it, but it's listed
> =A0* in yp_prot.h as being available, so it's probably a good idea to
> - * leave it in case somebody goes looking for it.
> + * leave it in in case somebody goes looking for it.

"leave it" and "leave it in" are equal.

> =A0*/
> =A0typedef struct {
> =A0 =A0 =A0 =A0char *dptr;
>
> Modified: head/lib/libelf/libelf_convert.m4
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/lib/libelf/libelf_convert.m4 =A0 Mon Feb 28 09:11:46 2011 =A0 =
=A0 =A0 =A0(r219095)
> +++ head/lib/libelf/libelf_convert.m4 =A0 Mon Feb 28 10:03:48 2011 =A0 =
=A0 =A0 =A0(r219096)
> @@ -136,7 +136,7 @@ __FBSDID("$FreeBSD$");
>
> =A0/*
> =A0* Read in various integral values. =A0The source pointer could be
> - * unaligned. =A0Values are read in native byte order. =A0The source
> + * unaligned. =A0Values are read in in native byte order. =A0The source
> =A0* pointer is incremented appropriately.
> =A0*/
>
>
> Modified: head/share/man/man7/security.7
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/share/man/man7/security.7 =A0 =A0 =A0Mon Feb 28 09:11:46 2011 =
=A0 =A0 =A0 =A0(r219095)
> +++ head/share/man/man7/security.7 =A0 =A0 =A0Mon Feb 28 10:03:48 2011 =
=A0 =A0 =A0 =A0(r219096)
> @@ -138,7 +138,7 @@ This gives you a convenient way to detec
> =A0Making
> =A0it impossible for an attacker to install a backdoor may actually be de=
trimental
> =A0to your security because it will not close off the hole the attacker u=
sed to
> -break in the first place.
> +break in in the first place.
> =A0.Pp
> =A0Security remedies should always be implemented with a multi-layered
> =A0.Dq onion peel
>
> Modified: head/sys/boot/i386/cdboot/cdboot.s
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/boot/i386/cdboot/cdboot.s =A0Mon Feb 28 09:11:46 2011 =A0 =
=A0 =A0 =A0(r219095)
> +++ head/sys/boot/i386/cdboot/cdboot.s =A0Mon Feb 28 10:03:48 2011 =A0 =
=A0 =A0 =A0(r219096)
> @@ -174,7 +174,7 @@ lookup_path: =A0 =A0 =A0 =A0push %si =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0# Save file name
> =A0lookup_found: =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0# Found a loader file
> =A0#
> =A0# Load the binary into the buffer. =A0Due to real mode addressing limi=
tations
> -# we have to read it in 64k chunks.
> +# we have to read it in in 64k chunks.
> =A0#
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0mov DIR_SIZE(%bx),%eax =A0 =A0 =A0 =A0 =A0=
# Read file length
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0add $SECTOR_SIZE-1,%eax =A0 =A0 =A0 =A0 # =
Convert length to sectors
>
> Modified: head/sys/boot/pc98/cdboot/cdboot.s
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/boot/pc98/cdboot/cdboot.s =A0Mon Feb 28 09:11:46 2011 =A0 =
=A0 =A0 =A0(r219095)
> +++ head/sys/boot/pc98/cdboot/cdboot.s =A0Mon Feb 28 10:03:48 2011 =A0 =
=A0 =A0 =A0(r219096)
> @@ -415,7 +415,7 @@ lookup_path: =A0 =A0 =A0 =A0push %si =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0# Save file name
> =A0lookup_found: =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0# Found a loader file
> =A0#
> =A0# Load the binary into the buffer. =A0Due to real mode addressing limi=
tations
> -# we have to read it in 64k chunks.
> +# we have to read it in in 64k chunks.

These have the form "read it in in x parts" and that's worse than just
"read it in x parts." read=3Din and write=3Dout is a fair assumption,
IMHO, if you disagree, then switch to "read it in using 64k chunks."

> =A0#
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0mov %es:DIR_SIZE(%bx),%eax =A0 =A0 =A0# Re=
ad file length
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0add $SECTOR_SIZE-1,%eax =A0 =A0 =A0 =A0 # =
Convert length to sectors
>
> Modified: head/usr.bin/checknr/checknr.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/usr.bin/checknr/checknr.c =A0 =A0 =A0Mon Feb 28 09:11:46 2011 =
=A0 =A0 =A0 =A0(r219095)
> +++ head/usr.bin/checknr/checknr.c =A0 =A0 =A0Mon Feb 28 10:03:48 2011 =
=A0 =A0 =A0 =A0(r219096)
> @@ -79,7 +79,7 @@ struct stkstr {
> =A0 =A0 =A0 =A0int opno; =A0 =A0 =A0 /* number of opening bracket */
> =A0 =A0 =A0 =A0int pl; =A0 =A0 =A0 =A0 /* '+', '-', ' ' for \s, 1 for \f,=
 0 for .ft */
> =A0 =A0 =A0 =A0int parm; =A0 =A0 =A0 /* parm to size, font, etc */
> - =A0 =A0 =A0 int lno; =A0 =A0 =A0 =A0/* line number the thing came in */
> + =A0 =A0 =A0 int lno; =A0 =A0 =A0 =A0/* line number the thing came in in=
 */

How about "line number of x?" (I can't tell what x is from the context.)

--=20
Rob Farmer

> =A0} stk[MAXSTK];
> =A0int stktop;
>
> _______________________________________________
> svn-src-head@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"
>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTiktZ-hdH=u4sHZ4RevCix2SASYPmGSRZa5PFxgf>