From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29642 invoked by alias); 30 Aug 2013 12:58:27 -0000 Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org Received: (qmail 29614 invoked by uid 89); 30 Aug 2013 12:58:27 -0000 Received: from popelka.ms.mff.cuni.cz (HELO popelka.ms.mff.cuni.cz) (195.113.20.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 30 Aug 2013 12:58:27 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.6 required=5.0 tests=AWL,BAYES_50,FREEMAIL_FROM,SPF_NEUTRAL autolearn=no version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: popelka.ms.mff.cuni.cz Received: from domone.kolej.mff.cuni.cz (popelka.ms.mff.cuni.cz [195.113.20.131]) by popelka.ms.mff.cuni.cz (Postfix) with ESMTPS id F1054483B0; Fri, 30 Aug 2013 14:58:16 +0200 (CEST) Received: by domone.kolej.mff.cuni.cz (Postfix, from userid 1000) id C342A5F750; Fri, 30 Aug 2013 14:58:16 +0200 (CEST) Date: Fri, 30 Aug 2013 12:58:00 -0000 From: =?utf-8?B?T25kxZllaiBCw61sa2E=?= To: "Joseph S. Myers" Cc: libc-alpha@sourceware.org, libc-ports@sourceware.org Subject: Re: [PATCH 3.5/9] Fix then/than typo. Message-ID: <20130830125816.GA12178@domone.kolej.mff.cuni.cz> References: <20130813082629.GA27180@domone.kolej.mff.cuni.cz> <20130818164943.GA7418@domone> <20130818220954.GA20381@domone> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130818220954.GA20381@domone> User-Agent: Mutt/1.5.20 (2009-06-14) X-SW-Source: 2013-08/txt/msg00079.txt.bz2 As in previos patch was also a 'less then' typo. To check all occurences I replaced all 'less then', 'greater then', 'more then', 'larger then' by than variant. There was one translated string "%s: more then one 'else'" do we need to do something to regenerate localisation? Rest should be obvious. ./ChangeLog: * csu/init-first.c: Fix then/than typos. * locale/programs/ld-collate.c: Likewise. * locale/programs/linereader.h: Likewise. * manual/arith.texi: Likewise. * manual/charset.texi: Likewise. * manual/filesys.texi: Likewise. * manual/stdio.texi: Likewise. * manual/string.texi: Likewise. * stdlib/fmtmsg.c: Likewise. * sysdeps/i386/stpncpy.S: Likewise. * sysdeps/powerpc/powerpc32/power6/memcpy.S: Likewise. * sysdeps/powerpc/powerpc32/power6/memset.S: Likewise. * sysdeps/powerpc/powerpc64/power6/memcpy.S: Likewise. * sysdeps/powerpc/powerpc64/power6/memset.S: Likewise. * sysdeps/unix/sysv/linux/getdents.c: Likewise. ./ports/ChangeLog.alpha: * sysdeps/alpha/alphaev67/stpncpy.S: Fix then/than typos. ./ports/ChangeLog.mips: * sysdeps/mips/memcpy.S: Fix then/than typos. --- - * then PREFETCH_CHUNK, the assumed size of each prefetch. If the real size - * of a prefetch is greater then MAX_PREFETCH_SIZE and the PREPAREFORSTORE + * than PREFETCH_CHUNK, the assumed size of each prefetch. If the real size + * of a prefetch is greater than MAX_PREFETCH_SIZE and the PREPAREFORSTORE - * then 5 on a STORE prefetch and that a single prefetch can never be larger - * then MAX_PREFETCH_SIZE. We add the extra 32 when USE_DOUBLE is set because + * than 5 on a STORE prefetch and that a single prefetch can never be larger + * than MAX_PREFETCH_SIZE. We add the extra 32 when USE_DOUBLE is set because - word for dst. If more then 32 bytes remain we copy (unaligned src) - the next 7 words and repeat the loop until less then 32-bytes + word for dst. If more than 32 bytes remain we copy (unaligned src) + the next 7 words and repeat the loop until less than 32-bytes eded. Finally we check \n-if there more then 0 bytes (1-3) bytes remaining and u eded. Finally we check \n+if there more than 0 bytes (1-3) bytes remaining and u ^ * The first field must not contain more then 10 bytes. */ \n if (cp - label > 1 * The first field must not contain more than 10 bytes. */ \n if (cp - label > 1 ^ -/* The second field must not have more then 14 bytes. */ \n || strlen (cp + 1) +/* The second field must not have more than 14 bytes. */ \n || strlen (cp + 1) ^ haracter in any character set uses more then 16 bytes. */ \n unsigned char byte haracter in any character set uses more than 16 bytes. */ \n unsigned char byte ^ * \n-* If the size is less then 2*NSIZE (8 or 16), go to L(lastb). * \n+* If the size is less than 2*NSIZE (8 or 16), go to L(lastb). ^ * \n-* Here we have less then 32(64) bytes to copy. Set up for a * \n+* Here we have less than 32(64) bytes to copy. Set up for a ^ * \n-* Here we have less then 32(64) bytes to copy. Set up for a * \n+* Here we have less than 32(64) bytes to copy. Set up for a ^ wus_tail16p2): /* 16 bytes moved, less then 4 bytes left. */ \n addi 12,12,16 wus_tail16p2): /* 16 bytes moved, less than 4 bytes left. */ \n addi 12,12,16 ^ dus_tail16p2): /* 16 bytes moved, less then 4 bytes left. */ \n addi 12,12,16 dus_tail16p2): /* 16 bytes moved, less than 4 bytes left. */ \n addi 12,12,16 ^ .align 4 \n-L(wus_tail16p4): /* less then 4 bytes left. */ \n addi 12,12,24 .align 4 \n+L(wus_tail16p4): /* less than 4 bytes left. */ \n addi 12,12,24 ^ .align 4 \n-L(dus_tail16p4): /* less then 4 bytes left. */ \n addi 12,12,24 .align 4 \n+L(dus_tail16p4): /* less than 4 bytes left. */ \n addi 12,12,24 ^ .align 4 \n-L(wus_tail8p4): /* less then 4 bytes left. */ \n addi 12,12,8 .align 4 \n+L(wus_tail8p4): /* less than 4 bytes left. */ \n addi 12,12,8 ^ .align 4 \n-L(dus_tail8p4): /* less then 4 bytes left. */ \n addi 12,12,8 .align 4 \n+L(dus_tail8p4): /* less than 4 bytes left. */ \n addi 12,12,8 ^ If we are here we know there is \n-more then 4 bytes left. So there is no need If we are here we know there is \n+more than 4 bytes left. So there is no need ^ If we are here we know there is \n-more then 4 bytes left. So there is no need If we are here we know there is \n+more than 4 bytes left. So there is no need ^ \n-Then if more then 4 bytes remain we again use aligned \n+Then if more than 4 bytes remain we again use aligned ^ .align 4 \n-L(dus_tail16p8): /* less then 8 bytes left. */ \n beq cr1,L(du .align 4 \n+L(dus_tail16p8): /* less than 8 bytes left. */ \n beq cr1,L(du ^ .align 4 \n-L(wus_tail16p8): /* less then 8 bytes left. */ \n beq cr1,L(wu .align 4 \n+L(wus_tail16p8): /* less than 8 bytes left. */ \n beq cr1,L(wu ^ eam can be \n-used even on files larger then @math{2^31} bytes on 32 bit machine eam can be \n+used even on files larger than @math{2^31} bytes on 32 bit machine ^ stream can \n-be used for files larger then @math{2^31} bytes on 32-bit machine stream can \n+be used for files larger than @math{2^31} bytes on 32-bit machine ^ is also able to work on \n-files larger then @math{2^31} bytes on 32-bit systems is also able to work on \n+files larger than @math{2^31} bytes on 32-bit systems ^ is also able to work on \n-files larger then @math{2^31} bytes on 32-bit systems is also able to work on \n+files larger than @math{2^31} bytes on 32-bit systems ^ \n-If the length of @var{from} is more then @var{size}, then @code{stpncpy} \n \n+If the length of @var{from} is more than @var{size}, then @code{stpncpy} \n ^ \n-If the length of @var{wfrom} is more then @var{size}, then \n @code{wcpncpy} \n+If the length of @var{wfrom} is more than @var{size}, then \n @code{wcpncpy} ^ \n-/* Copy no more then N bytes from SRC to DEST, returning \n+/* Copy no more than N bytes from SRC to DEST, returning ^ -1,4 +1,4 @@ \n-/* copy no more then N bytes from SRC to DEST, returning -1,4 +1,4 @@ \n+/* copy no more than N bytes from SRC to DEST, returning ^ { \n-lr_error (ldfile, _("%s: more then one 'else'"), "LC_COLLATE"); \n } { \n+lr_error (ldfile, _("%s: more than one 'else'"), "LC_COLLATE"); \n } ^ zero if we have to be prepared for more then one libc being \n used in the proce zero if we have to be prepared for more than one libc being \n used in the proce ^ cache line boundary. \n-If rLEN is less then the distance to the next cache-line cache line boundary. \n+If rLEN is less than the distance to the next cache-line ^ cache line boundary. \n-If rLEN is less then the distance to the next cache-line cache line boundary. \n+If rLEN is less than the distance to the next cache-line ^ cache line boundary. \n-If rLEN is less then the distance to the next cache-line cache line boundary. \n+If rLEN is less than the distance to the next cache-line ^ cache line boundary. \n-If rLEN is less then the distance to the next cache-line cache line boundary. \n+If rLEN is less than the distance to the next cache-line ^ cceptable since a) this value is larger then the length of \n the longest multib cceptable since a) this value is larger than the length of \n the longest multib ^ he \n-amount of data returned much more then the reduced buffer size. */ \n ssi he \n+amount of data returned much more than the reduced buffer size. */ \n ssi ^ m \n-Square root if the operand is less then zero. More generally, any \n mathe m \n+Square root if the operand is less than zero. More generally, any \n mathe ^ diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c index 05344f0..5185de4 100644 --- a/stdlib/fmtmsg.c +++ b/stdlib/fmtmsg.c @@ -116,9 +116,9 @@ fmtmsg (long int classification, const char *label, int severity, if (cp == NULL) return MM_NOTOK; - /* The first field must not contain more then 10 bytes. */ + /* The first field must not contain more than 10 bytes. */ if (cp - label > 10 - /* The second field must not have more then 14 bytes. */ + /* The second field must not have more than 14 bytes. */ || strlen (cp + 1) > 14) return MM_NOTOK; } diff --git a/locale/programs/linereader.h b/locale/programs/linereader.h index e0475a2..4e4fe9d 100644 --- a/locale/programs/linereader.h +++ b/locale/programs/linereader.h @@ -49,7 +49,7 @@ struct token struct { /* This element is sized on the safe expectation that no single - character in any character set uses more then 16 bytes. */ + character in any character set uses more than 16 bytes. */ unsigned char bytes[16]; int nbytes; } charcode; diff --git a/ports/sysdeps/mips/memcpy.S b/ports/sysdeps/mips/memcpy.S index 8065da3..c716847 100644 --- a/ports/sysdeps/mips/memcpy.S +++ b/ports/sysdeps/mips/memcpy.S @@ -275,7 +275,7 @@ LEAF(MEMCPY_NAME) L(memcpy): #endif /* - * If the size is less then 2*NSIZE (8 or 16), go to L(lastb). Regardless of + * If the size is less than 2*NSIZE (8 or 16), go to L(lastb). Regardless of * size, copy dst pointer to v0 for the return value. */ slti t2,a2,(2 * NSIZE) diff --git a/sysdeps/powerpc/powerpc32/power6/memcpy.S b/sysdeps/powerpc/powerpc32/power6/memcpy.S index c3d55b7..c786806 100644 --- a/sysdeps/powerpc/powerpc32/power6/memcpy.S +++ b/sysdeps/powerpc/powerpc32/power6/memcpy.S @@ -426,14 +426,14 @@ L(wdu): First we need to copy word up to but not crossing the next 32-byte boundary. Then perform aligned loads just before and just after the boundary and use shifts and or to generate the next aligned - word for dst. If more then 32 bytes remain we copy (unaligned src) - the next 7 words and repeat the loop until less then 32-bytes + word for dst. If more than 32 bytes remain we copy (unaligned src) + the next 7 words and repeat the loop until less than 32-bytes remain. - Then if more then 4 bytes remain we again use aligned loads, + Then if more than 4 bytes remain we again use aligned loads, shifts and or to generate the next dst word. We then process the remaining words using unaligned loads as needed. Finally we check - if there more then 0 bytes (1-3) bytes remaining and use + if there more than 0 bytes (1-3) bytes remaining and use halfword and or byte load/stores to complete the copy. */ mr 4,12 /* restore unaligned adjusted src ptr */ diff --git a/ports/sysdeps/mips/memcpy.S b/ports/sysdeps/mips/memcpy.S index 8065da3..c716847 100644 --- a/ports/sysdeps/mips/memcpy.S +++ b/ports/sysdeps/mips/memcpy.S @@ -443,7 +443,7 @@ L(chkw): PTR_ADDIU a0,a0,UNIT(8) /* - * Here we have less then 32(64) bytes to copy. Set up for a loop to + * Here we have less than 32(64) bytes to copy. Set up for a loop to * copy one word (or double word) at a time. Set a2 to count how many * bytes we have to copy after all the word (or double word) chunks are * copied and a3 to the dst pointer after all the (d)word chunks have diff --git a/ports/sysdeps/mips/memcpy.S b/ports/sysdeps/mips/memcpy.S index 8065da3..c716847 100644 --- a/ports/sysdeps/mips/memcpy.S +++ b/ports/sysdeps/mips/memcpy.S @@ -635,7 +635,7 @@ L(ua_chkw): C_ST REG7,UNIT(7)(a0) PTR_ADDIU a0,a0,UNIT(8) /* - * Here we have less then 32(64) bytes to copy. Set up for a loop to + * Here we have less than 32(64) bytes to copy. Set up for a loop to * copy one word (or double word) at a time. */ L(ua_chk1w): diff --git a/sysdeps/powerpc/powerpc32/power6/memcpy.S b/sysdeps/powerpc/powerpc32/power6/memcpy.S index c3d55b7..c786806 100644 --- a/sysdeps/powerpc/powerpc32/power6/memcpy.S +++ b/sysdeps/powerpc/powerpc32/power6/memcpy.S @@ -283,7 +283,7 @@ L(wus_tail16p8): /* less then 8 bytes left. */ addi 1,1,32 blr .align 4 -L(wus_tail16p4): /* less then 4 bytes left. */ +L(wus_tail16p4): /* less than 4 bytes left. */ addi 12,12,24 addi 11,11,24 bgt cr0,L(wus_tail2) diff --git a/sysdeps/powerpc/powerpc32/power6/memcpy.S b/sysdeps/powerpc/powerpc32/power6/memcpy.S index c3d55b7..c786806 100644 --- a/sysdeps/powerpc/powerpc32/power6/memcpy.S +++ b/sysdeps/powerpc/powerpc32/power6/memcpy.S @@ -291,7 +291,7 @@ L(wus_tail16p4): /* less then 4 bytes left. */ addi 1,1,32 blr .align 4 -L(wus_tail16p2): /* 16 bytes moved, less then 4 bytes left. */ +L(wus_tail16p2): /* 16 bytes moved, less than 4 bytes left. */ addi 12,12,16 addi 11,11,16 b L(wus_tail2) diff --git a/sysdeps/powerpc/powerpc32/power6/memcpy.S b/sysdeps/powerpc/powerpc32/power6/memcpy.S index c3d55b7..c786806 100644 --- a/sysdeps/powerpc/powerpc32/power6/memcpy.S +++ b/sysdeps/powerpc/powerpc32/power6/memcpy.S @@ -315,7 +315,7 @@ L(wus_tail8): /* Move 8 bytes. */ addi 1,1,32 blr .align 4 -L(wus_tail8p4): /* less then 4 bytes left. */ +L(wus_tail8p4): /* less than 4 bytes left. */ addi 12,12,8 addi 11,11,8 bgt cr1,L(wus_tail2) diff --git a/sysdeps/powerpc/powerpc64/power6/memcpy.S b/sysdeps/powerpc/powerpc64/power6/memcpy.S index db29e2b..d6d242d 100644 --- a/sysdeps/powerpc/powerpc64/power6/memcpy.S +++ b/sysdeps/powerpc/powerpc64/power6/memcpy.S @@ -464,7 +464,7 @@ L(dus_tail16p8): /* less then 8 bytes left. */ ld 3,-16(1) blr .align 4 -L(dus_tail16p4): /* less then 4 bytes left. */ +L(dus_tail16p4): /* less than 4 bytes left. */ addi 12,12,24 addi 3,3,24 bgt cr0,L(dus_tail2) diff --git a/sysdeps/powerpc/powerpc64/power6/memcpy.S b/sysdeps/powerpc/powerpc64/power6/memcpy.S index db29e2b..d6d242d 100644 --- a/sysdeps/powerpc/powerpc64/power6/memcpy.S +++ b/sysdeps/powerpc/powerpc64/power6/memcpy.S @@ -472,7 +472,7 @@ L(dus_tail16p4): /* less then 4 bytes left. */ ld 3,-16(1) blr .align 4 -L(dus_tail16p2): /* 16 bytes moved, less then 4 bytes left. */ +L(dus_tail16p2): /* 16 bytes moved, less than 4 bytes left. */ addi 12,12,16 addi 3,3,16 b L(dus_tail2) diff --git a/sysdeps/powerpc/powerpc64/power6/memcpy.S b/sysdeps/powerpc/powerpc64/power6/memcpy.S index db29e2b..d6d242d 100644 --- a/sysdeps/powerpc/powerpc64/power6/memcpy.S +++ b/sysdeps/powerpc/powerpc64/power6/memcpy.S @@ -497,7 +497,7 @@ L(dus_tail8): /* Move 8 bytes. */ ld 3,-16(1) blr .align 4 -L(dus_tail8p4): /* less then 4 bytes left. */ +L(dus_tail8p4): /* less than 4 bytes left. */ addi 12,12,8 addi 3,3,8 bgt cr1,L(dus_tail2) diff --git a/sysdeps/powerpc/powerpc32/power6/memcpy.S b/sysdeps/powerpc/powerpc32/power6/memcpy.S index c3d55b7..c786806 100644 --- a/sysdeps/powerpc/powerpc32/power6/memcpy.S +++ b/sysdeps/powerpc/powerpc32/power6/memcpy.S @@ -326,7 +326,7 @@ L(wus_tail8p4): /* less then 4 bytes left. */ .align 4 L(wus_tail4): /* Move 4 bytes. */ /* r6 already loaded speculatively. If we are here we know there is - more then 4 bytes left. So there is no need to test. */ + more than 4 bytes left. So there is no need to test. */ addi 12,12,4 stw 6,0(11) addi 11,11,4 diff --git a/sysdeps/powerpc/powerpc64/power6/memcpy.S b/sysdeps/powerpc/powerpc64/power6/memcpy.S index db29e2b..d6d242d 100644 --- a/sysdeps/powerpc/powerpc64/power6/memcpy.S +++ b/sysdeps/powerpc/powerpc64/power6/memcpy.S @@ -508,7 +508,7 @@ L(dus_tail8p4): /* less then 4 bytes left. */ .align 4 L(dus_tail4): /* Move 4 bytes. */ /* r6 already loaded speculatively. If we are here we know there is - more then 4 bytes left. So there is no need to test. */ + more than 4 bytes left. So there is no need to test. */ addi 12,12,4 stw 6,0(3) addi 3,3,4 diff --git a/sysdeps/powerpc/powerpc32/power6/memcpy.S b/sysdeps/powerpc/powerpc32/power6/memcpy.S index c3d55b7..c786806 100644 --- a/sysdeps/powerpc/powerpc32/power6/memcpy.S +++ b/sysdeps/powerpc/powerpc32/power6/memcpy.S @@ -269,7 +269,7 @@ L(wus_tail16): /* Move 16 bytes. */ addi 1,1,32 blr .align 4 -L(wus_tail16p8): /* less then 8 bytes left. */ +L(wus_tail16p8): /* less than 8 bytes left. */ beq cr1,L(wus_tailX) /* exactly 16 bytes, early exit. */ cmplwi cr1,10,20 bf 29,L(wus_tail16p2) diff --git a/sysdeps/powerpc/powerpc64/power6/memcpy.S b/sysdeps/powerpc/powerpc64/power6/memcpy.S index db29e2b..d6d242d 100644 --- a/sysdeps/powerpc/powerpc64/power6/memcpy.S +++ b/sysdeps/powerpc/powerpc64/power6/memcpy.S @@ -450,7 +450,7 @@ L(dus_tail16): /* Move 16 bytes. */ ld 3,-16(1) blr .align 4 -L(dus_tail16p8): /* less then 8 bytes left. */ +L(dus_tail16p8): /* less than 8 bytes left. */ beq cr1,L(dus_tailX) /* exactly 16 bytes, early exit. */ cmpldi cr1,10,20 bf 29,L(dus_tail16p2) diff --git a/manual/stdio.texi b/manual/stdio.texi index 3f9be9b..30630ca 100644 --- a/manual/stdio.texi +++ b/manual/stdio.texi @@ -267,7 +267,7 @@ Locks}. @deftypefun {FILE *} fopen64 (const char *@var{filename}, const char *@var{opentype}) This function is similar to @code{fopen} but the stream it returns a pointer for is opened using @code{open64}. Therefore this stream can be -used even on files larger then @math{2^31} bytes on 32 bit machines. +used even on files larger than @math{2^31} bytes on 32 bit machines. Please note that the return type is still @code{FILE *}. There is no special @code{FILE} type for the LFS interface. diff --git a/manual/filesys.texi b/manual/filesys.texi index 814c210..1cac453 100644 --- a/manual/filesys.texi +++ b/manual/filesys.texi @@ -3152,7 +3152,7 @@ interface transparently replaces the old interface. @deftypefun {FILE *} tmpfile64 (void) This function is similar to @code{tmpfile}, but the stream it returns a pointer to was opened using @code{tmpfile64}. Therefore this stream can -be used for files larger then @math{2^31} bytes on 32-bit machines. +be used for files larger than @math{2^31} bytes on 32-bit machines. Please note that the return type is still @code{FILE *}. There is no special @code{FILE} type for the LFS interface. diff --git a/manual/filesys.texi b/manual/filesys.texi index 814c210..1cac453 100644 --- a/manual/filesys.texi +++ b/manual/filesys.texi @@ -1909,7 +1909,7 @@ replaces the normal implementation. @comment Unix98 @deftypefun int stat64 (const char *@var{filename}, struct stat64 *@var{buf}) This function is similar to @code{stat} but it is also able to work on -files larger then @math{2^31} bytes on 32-bit systems. To be able to do +files larger than @math{2^31} bytes on 32-bit systems. To be able to do this the result is stored in a variable of type @code{struct stat64} to which @var{buf} must point. diff --git a/manual/filesys.texi b/manual/filesys.texi index 814c210..1cac453 100644 --- a/manual/filesys.texi +++ b/manual/filesys.texi @@ -1970,7 +1970,7 @@ replaces the normal implementation. @comment Unix98 @deftypefun int lstat64 (const char *@var{filename}, struct stat64 *@var{buf}) This function is similar to @code{lstat} but it is also able to work on -files larger then @math{2^31} bytes on 32-bit systems. To be able to do +files larger than @math{2^31} bytes on 32-bit systems. To be able to do this the result is stored in a variable of type @code{struct stat64} to which @var{buf} must point. diff --git a/manual/string.texi b/manual/string.texi index 246be84..2a164a9 100644 --- a/manual/string.texi +++ b/manual/string.texi @@ -707,7 +707,7 @@ declared in @file{string.h}. This function is similar to @code{wcpcpy} but copies always exactly @var{wsize} characters into @var{wto}. -If the length of @var{wfrom} is more then @var{size}, then +If the length of @var{wfrom} is more than @var{size}, then @code{wcpncpy} copies just the first @var{size} wide characters and returns a pointer to the wide character directly following the last non-null wide character which was copied last. Note that in this case diff --git a/manual/string.texi b/manual/string.texi index 246be84..2a164a9 100644 --- a/manual/string.texi +++ b/manual/string.texi @@ -682,7 +682,7 @@ The behavior of @code{wcpcpy} is undefined if the strings overlap. This function is similar to @code{stpcpy} but copies always exactly @var{size} characters into @var{to}. -If the length of @var{from} is more then @var{size}, then @code{stpncpy} +If the length of @var{from} is more than @var{size}, then @code{stpncpy} copies just the first @var{size} characters and returns a pointer to the character directly following the one which was copied last. Note that in this case there is no null terminator written into @var{to}. diff --git a/ports/sysdeps/alpha/alphaev67/stpncpy.S b/ports/sysdeps/alpha/alphaev67/stpncpy.S index 47841bb..336db7d 100644 --- a/ports/sysdeps/alpha/alphaev67/stpncpy.S +++ b/ports/sysdeps/alpha/alphaev67/stpncpy.S @@ -16,7 +16,7 @@ License along with the GNU C Library. If not, see . */ -/* Copy no more then N bytes from SRC to DEST, returning the address of +/* Copy no more than N bytes from SRC to DEST, returning the address of the terminating '\0' in DEST. */ #include diff --git a/sysdeps/i386/stpncpy.S b/sysdeps/i386/stpncpy.S index 1188273..b23e820 100644 --- a/sysdeps/i386/stpncpy.S +++ b/sysdeps/i386/stpncpy.S @@ -1,4 +1,4 @@ -/* copy no more then N bytes from SRC to DEST, returning the address of +/* copy no more than N bytes from SRC to DEST, returning the address of the terminating '\0' in DEST. For Intel 80x86, x>=3. Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index 6894a7c..e58c8f7 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -2674,7 +2674,7 @@ skip_to (struct linereader *ldfile, struct locale_collate_t *collate, } else if (nowtok == tok_else) { - lr_error (ldfile, _("%s: more then one 'else'"), "LC_COLLATE"); + lr_error (ldfile, _("%s: more than one 'else'"), "LC_COLLATE"); } lr_ignore_rest (ldfile, 0); diff --git a/csu/init-first.c b/csu/init-first.c index 89d8d96..f0ebc94 100644 --- a/csu/init-first.c +++ b/csu/init-first.c @@ -29,7 +29,7 @@ #include -/* Set nonzero if we have to be prepared for more then one libc being +/* Set nonzero if we have to be prepared for more than one libc being used in the process. Safe assumption if initializer never runs. */ int __libc_multiple_libcs attribute_hidden = 1; diff --git a/ports/sysdeps/mips/memcpy.S b/ports/sysdeps/mips/memcpy.S index 8065da3..c716847 100644 --- a/ports/sysdeps/mips/memcpy.S +++ b/ports/sysdeps/mips/memcpy.S @@ -155,14 +155,14 @@ pref PREFETCH_STORE_HINT, (chunk)*32(reg) #endif /* MAX_PREFETCH_SIZE is the maximum size of a prefetch, it must not be less - * then PREFETCH_CHUNK, the assumed size of each prefetch. If the real size - * of a prefetch is greater then MAX_PREFETCH_SIZE and the PREPAREFORSTORE + * than PREFETCH_CHUNK, the assumed size of each prefetch. If the real size + * of a prefetch is greater than MAX_PREFETCH_SIZE and the PREPAREFORSTORE * hint is used, the code will not work correctly. If PREPAREFORSTORE is not * used then MAX_PREFETCH_SIZE does not matter. */ #define MAX_PREFETCH_SIZE 128 /* PREFETCH_LIMIT is set based on the fact that we never use an offset greater - * then 5 on a STORE prefetch and that a single prefetch can never be larger - * then MAX_PREFETCH_SIZE. We add the extra 32 when USE_DOUBLE is set because + * than 5 on a STORE prefetch and that a single prefetch can never be larger + * than MAX_PREFETCH_SIZE. We add the extra 32 when USE_DOUBLE is set because * we actually do two prefetches in that case, one 32 bytes after the other. */ #ifdef USE_DOUBLE # define PREFETCH_LIMIT (5 * PREFETCH_CHUNK) + 32 + MAX_PREFETCH_SIZE diff --git a/sysdeps/powerpc/powerpc32/power6/memset.S b/sysdeps/powerpc/powerpc32/power6/memset.S index ce06630..8c23c8d 100644 --- a/sysdeps/powerpc/powerpc32/power6/memset.S +++ b/sysdeps/powerpc/powerpc32/power6/memset.S @@ -101,7 +101,7 @@ L(nondcbz): boundary may not be at cache line (128-byte) boundary. */ L(nzloopstart): /* memset in 32-byte chunks until we get to a cache line boundary. - If rLEN is less then the distance to the next cache-line boundary use + If rLEN is less than the distance to the next cache-line boundary use cacheAligned1 code to finish the tail. */ cmplwi cr1,rLEN,128 diff --git a/sysdeps/powerpc/powerpc32/power6/memset.S b/sysdeps/powerpc/powerpc32/power6/memset.S index ce06630..8c23c8d 100644 --- a/sysdeps/powerpc/powerpc32/power6/memset.S +++ b/sysdeps/powerpc/powerpc32/power6/memset.S @@ -306,7 +306,7 @@ L(nzCacheAligned256): block zero instruction. */ L(zloopstart): /* memset in 32-byte chunks until we get to a cache line boundary. - If rLEN is less then the distance to the next cache-line boundary use + If rLEN is less than the distance to the next cache-line boundary use cacheAligned1 code to finish the tail. */ cmplwi cr1,rLEN,128 beq L(medium) diff --git a/sysdeps/powerpc/powerpc64/power6/memset.S b/sysdeps/powerpc/powerpc64/power6/memset.S index 541a45f..3e8ae2d 100644 --- a/sysdeps/powerpc/powerpc64/power6/memset.S +++ b/sysdeps/powerpc/powerpc64/power6/memset.S @@ -110,7 +110,7 @@ L(caligned): boundary may not be at cache line (128-byte) boundary. */ L(nzloopstart): /* memset in 32-byte chunks until we get to a cache line boundary. - If rLEN is less then the distance to the next cache-line boundary use + If rLEN is less than the distance to the next cache-line boundary use cacheAligned1 code to finish the tail. */ cmpldi cr1,rLEN,128 diff --git a/sysdeps/powerpc/powerpc64/power6/memset.S b/sysdeps/powerpc/powerpc64/power6/memset.S index 541a45f..3e8ae2d 100644 --- a/sysdeps/powerpc/powerpc64/power6/memset.S +++ b/sysdeps/powerpc/powerpc64/power6/memset.S @@ -186,7 +186,7 @@ L(nzCacheAligned128): block zero instruction. */ L(zloopstart): /* memset in 32-byte chunks until we get to a cache line boundary. - If rLEN is less then the distance to the next cache-line boundary use + If rLEN is less than the distance to the next cache-line boundary use cacheAligned1 code to finish the tail. */ cmpldi cr1,rLEN,128 beq L(medium) diff --git a/manual/charset.texi b/manual/charset.texi index e21502e..4042639 100644 --- a/manual/charset.texi +++ b/manual/charset.texi @@ -786,7 +786,7 @@ mbslen (const char *s) This function simply calls @code{mbrlen} for each multibyte character in the string and counts the number of function calls. Please note that we here use @code{MB_LEN_MAX} as the size argument in the @code{mbrlen} -call. This is acceptable since a) this value is larger then the length of +call. This is acceptable since a) this value is larger than the length of the longest multibyte character sequence and b) we know that the string @var{s} ends with a NUL byte, which cannot be part of any other multibyte character sequence but the one representing the NUL wide character.