This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] Remove doubled words


Ulrich Drepper wrote:
> On Tue, Apr 12, 2011 at 04:11, Jim Meyering <jim@meyering.net> wrote:
>> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c
>> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c
>> @@ -1,4 +1,4 @@
>> -/* Copyright (C) 1997-2002,2005,2006 Free Software Foundation, Inc.
>> +/* Copyright (C) 1997-2002,2005,2006,2011 Free Software Foundation, Inc.
>> ? ?This file is part of the GNU C Library.
>>
>> ? ?The GNU C Library is free software; you can redistribute it and/or
>> @@ -32,7 +32,7 @@ extern int __have_no_truncate64;
>> ?#endif
>>
>>
>> -/* Truncate the file FD refers to to LENGTH bytes. ?*/
>> +/* Truncate the file FD refers to LENGTH bytes. ?*/
>
> You have to be more careful.  The double to might not be the best form
> of English but the new text is plain wrong.  I haven't checked for
> other problems like this and wait for someone to confirm a newly
> submitted patch doesn't have any such problems.

There were indeed others, identical to that.  Many.
I've changed them all like this:

    --- a/sysdeps/unix/sysv/linux/ftruncate64.c
    +++ b/sysdeps/unix/sysv/linux/ftruncate64.c
    -/* Truncate the file FD refers to to LENGTH bytes.  */
    +/* Truncate the file referenced by FD to LENGTH bytes.  */

There was another questionable change.  Now,
rather than s/in in/in/, I do this in several cases:

    --- a/sysdeps/unix/sysv/linux/check_pf.c
    +++ b/sysdeps/unix/sysv/linux/check_pf.c
    -/* We don't know if we have NETLINK support compiled in in our
    +/* We don't know if we have NETLINK support compiled into our


From cf1a04f2269740829e7683ebd84db7aa93d151af Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sun, 10 Apr 2011 22:54:47 +0200
Subject: [PATCH] Remove doubled words in comments, e.g., s/the the/the/, s/to
 to/to/

Run this command to identify suspects:
  git ls-files .|xargs perl -0777 -n \
    -e 'while (/\b(then?|in|on|if|at|but|f?or|and|to)\s+\1\b/gms)' \
    -e '{$n=($` =~ tr/\n/\n/ + 1); ($v=$&)=~s/\n/\\n/g;' \
    -e 'print "$ARGV:$n:$v\n"}'|grep -v ChangeLog
* elf/dl-lookup.c (do_lookup_x): s/at at/at all/
* misc/tst-efgcvt.c (special): s/for for/for/
* stdlib/gmp-impl.h: Likewise.
* elf/cache.c: s/the the/the/
* elf/dl-object.c: Likewise.
* libio/fileops.c: s/the the/the/
* libio/oldfileops.c: Likewise.
* libio/wfileops.c: Likewise.
* malloc/malloc.c: Likewise.
* manual/stdio.texi: s/and and/and/
* misc/fchflags.c: Reword to avoid awkward "to to".
* io/fchmod.c: Likewise.
* misc/ftruncate.c: Likewise.
* misc/ftruncate64.c: Likewise.
* sysdeps/mach/hurd/fchflags.c: Likewise.
* sysdeps/mach/hurd/fchmod.c: Likewise.
* sysdeps/mach/hurd/ftruncate.c: Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.c: Likewise.
* sysdeps/unix/sysv/linux/ftruncate64.c: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c: Likewise.
* sysdeps/unix/sysv/linux/truncate64.c: Likewise.
* nscd/connections.c: s/the the/the/
* sysdeps/generic/tls.h: Likewise.
* sysdeps/i386/stpncpy.S: Likewise.
* sysdeps/ia64/fpu/libm_lgammal.S: s/if if/if/
* sysdeps/ia64/memcmp.S: s/the the/the/
* sysdeps/ia64/strcpy.S: Likewise.
* sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S: s/the the/the/
* sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S: Likewise.
* sysdeps/powerpc/powerpc32/power4/memcpy.S: Likewise.
* sysdeps/powerpc/powerpc32/power4/strncmp.S: s/and and/and/
* sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S: s/the the/the/
* sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S: Likewise.
* sysdeps/powerpc/powerpc32/power6/memcpy.S: Likewise.
* sysdeps/powerpc/powerpc32/power7/strncmp.S: s/and and/and/
* sysdeps/powerpc/powerpc32/strncmp.S: Likewise.
* sysdeps/powerpc/powerpc64/memcpy.S: s/the the/the/
* sysdeps/powerpc/powerpc64/power4/memcmp.S: s/and and/and/
* sysdeps/powerpc/powerpc64/power4/memcpy.S: s/the the/the/
* sysdeps/powerpc/powerpc64/power4/strncmp.S: s/and and/and/
* sysdeps/powerpc/powerpc64/power6/memcpy.S: s/the the/the/
* sysdeps/powerpc/powerpc64/power7/memcmp.S: s/and and/and/
* sysdeps/powerpc/powerpc64/power7/strncmp.S: Likewise.
* sysdeps/powerpc/powerpc64/strchr.S: Likewise.
* sysdeps/powerpc/powerpc64/strcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/strcpy.S: Likewise.
* sysdeps/powerpc/powerpc64/strlen.S: Likewise.
* sysdeps/powerpc/powerpc64/strncmp.S: Likewise.
* sysdeps/unix/sysv/linux/check_pf.c: s/compiled in in our kernel
                                       /compiled into our kernel/
* sysdeps/unix/sysv/linux/ifaddrs.c: Likewise.
* time/strptime_l.c: s/the the/the/
* nptl/sysdeps/unix/sysv/linux/pthread_kill.c (__pthread_kill): s/for for/for/
* nptl/sysdeps/unix/sysv/linux/pthread_sigqueue.c (pthread_sigqueue): Likewise.
* nptl/tst-kill4.c: s/the the/the/
---
 elf/cache.c                                        |    4 ++--
 elf/dl-lookup.c                                    |    2 +-
 elf/dl-object.c                                    |    2 +-
 io/fchmod.c                                        |    4 ++--
 libio/fileops.c                                    |    6 +++---
 libio/oldfileops.c                                 |    6 +++---
 libio/wfileops.c                                   |    4 ++--
 locale/programs/ld-collate.c                       |    4 ++--
 malloc/malloc.c                                    |    4 ++--
 manual/stdio.texi                                  |    2 +-
 misc/fchflags.c                                    |    4 ++--
 misc/ftruncate.c                                   |    4 ++--
 misc/ftruncate64.c                                 |    4 ++--
 misc/tst-efgcvt.c                                  |    4 ++--
 nptl/sysdeps/unix/sysv/linux/pthread_kill.c        |    4 ++--
 nptl/sysdeps/unix/sysv/linux/pthread_sigqueue.c    |    4 ++--
 nptl/tst-kill4.c                                   |    4 ++--
 nscd/connections.c                                 |    2 +-
 nss/getnssent_r.c                                  |    4 ++--
 stdlib/gmp-impl.h                                  |    4 ++--
 sysdeps/generic/tls.h                              |    4 ++--
 sysdeps/i386/stpncpy.S                             |    4 ++--
 sysdeps/ia64/fpu/libm_lgammal.S                    |    2 +-
 sysdeps/ia64/memcmp.S                              |    4 ++--
 sysdeps/ia64/strcpy.S                              |    4 ++--
 sysdeps/mach/hurd/fchflags.c                       |    4 ++--
 sysdeps/mach/hurd/fchmod.c                         |    4 ++--
 sysdeps/mach/hurd/ftruncate.c                      |    4 ++--
 sysdeps/powerpc/powerpc32/dl-machine.c             |    4 ++--
 sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S      |    4 ++--
 sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S     |    4 ++--
 sysdeps/powerpc/powerpc32/power4/memcpy.S          |    4 ++--
 sysdeps/powerpc/powerpc32/power4/strncmp.S         |    4 ++--
 sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S      |    4 ++--
 sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S     |    4 ++--
 sysdeps/powerpc/powerpc32/power6/memcpy.S          |    4 ++--
 sysdeps/powerpc/powerpc32/power7/strncmp.S         |    4 ++--
 sysdeps/powerpc/powerpc32/strncmp.S                |    4 ++--
 sysdeps/powerpc/powerpc64/memcpy.S                 |    4 ++--
 sysdeps/powerpc/powerpc64/power4/memcmp.S          |    4 ++--
 sysdeps/powerpc/powerpc64/power4/memcpy.S          |    4 ++--
 sysdeps/powerpc/powerpc64/power4/strncmp.S         |    4 ++--
 sysdeps/powerpc/powerpc64/power6/memcpy.S          |    4 ++--
 sysdeps/powerpc/powerpc64/power7/memcmp.S          |    4 ++--
 sysdeps/powerpc/powerpc64/power7/strncmp.S         |    4 ++--
 sysdeps/powerpc/powerpc64/strchr.S                 |    4 ++--
 sysdeps/powerpc/powerpc64/strcmp.S                 |    4 ++--
 sysdeps/powerpc/powerpc64/strcpy.S                 |    4 ++--
 sysdeps/powerpc/powerpc64/strlen.S                 |    4 ++--
 sysdeps/powerpc/powerpc64/strncmp.S                |    4 ++--
 sysdeps/unix/sysv/linux/check_pf.c                 |    4 ++--
 sysdeps/unix/sysv/linux/ftruncate64.c              |    4 ++--
 sysdeps/unix/sysv/linux/ifaddrs.c                  |    4 ++--
 .../sysv/linux/powerpc/powerpc32/ftruncate64.c     |    4 ++--
 .../unix/sysv/linux/powerpc/powerpc32/truncate64.c |    4 ++--
 sysdeps/unix/sysv/linux/truncate64.c               |    4 ++--
 time/strptime_l.c                                  |    4 ++--
 57 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/elf/cache.c b/elf/cache.c
index b8561e4..0988593 100644
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2003,2005,2006,2007 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2003,2005,2006,2007,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>, 1999.

@@ -361,7 +361,7 @@ save_cache (const char *cache_name)
 	{
 	  /* We could subtract file_entries_new_size from str_offset -
 	     not doing so makes the code easier, the string table
-	     always begins at the beginning of the the new cache
+	     always begins at the beginning of the new cache
 	     struct.  */
 	  file_entries_new->libs[idx_new].flags = entry->flags;
 	  file_entries_new->libs[idx_new].osversion = entry->osversion;
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 874a4bb..19b27d7 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -194,7 +194,7 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash,
 	       might exist in more than one form

 	       If the library does not provide symbol version information
-	       there is no problem at at: we simply use the symbol if it
+	       there is no problem at all: we simply use the symbol if it
 	       is defined.

 	       These two lookups need to be handled differently if the
diff --git a/elf/dl-object.c b/elf/dl-object.c
index b30c845..ee93b6a 100644
--- a/elf/dl-object.c
+++ b/elf/dl-object.c
@@ -112,7 +112,7 @@ _dl_new_object (char *realname, const char *libname, int type,

   /* new->l_global = 0;	We use calloc therefore not necessary.  */

-  /* Use the 'l_scope_mem' array by default for the the 'l_scope'
+  /* Use the 'l_scope_mem' array by default for the 'l_scope'
      information.  If we need more entries we will allocate a large
      array dynamically.  */
   new->l_scope = new->l_scope_mem;
diff --git a/io/fchmod.c b/io/fchmod.c
index 4b5eacb..ce79daa 100644
--- a/io/fchmod.c
+++ b/io/fchmod.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995, 1996, 1997, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>

-/* Change the protections of the file FD refers to to MODE.  */
+/* Change the permissions of the file referenced by FD to MODE.  */
 int
 __fchmod (fd, mode)
      int fd;
diff --git a/libio/fileops.c b/libio/fileops.c
index 4698953..eba2768 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997-2005, 2006, 2007, 2008, 2009
+/* Copyright (C) 1993, 1995, 1997-2005, 2006, 2007, 2008, 2009, 2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Per Bothner <bothner@cygnus.com>.
@@ -507,7 +507,7 @@ new_do_write (fp, data, to_do)
   if (fp->_flags & _IO_IS_APPENDING)
     /* On a system without a proper O_APPEND implementation,
        you would need to sys_seek(0, SEEK_END) here, but is
-       is not needed nor desirable for Unix- or Posix-like systems.
+       not needed nor desirable for Unix- or Posix-like systems.
        Instead, just indicate that offset (before and after) is
        unpredictable. */
     fp->_offset = _IO_pos_BAD;
@@ -1109,7 +1109,7 @@ resync:
   /* We need to do it since it is possible that the file offset in
      the kernel may be changed behind our back. It may happen when
      we fopen a file and then do a fork. One process may access the
-     the file and the kernel file offset will be changed. */
+     file and the kernel file offset will be changed. */
   if (fp->_offset >= 0)
     _IO_SYSSEEK (fp, fp->_offset, 0);

diff --git a/libio/oldfileops.c b/libio/oldfileops.c
index 3bd0aa1..be99a25 100644
--- a/libio/oldfileops.c
+++ b/libio/oldfileops.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997-2004, 2005, 2007
+/* Copyright (C) 1993, 1995, 1997-2004, 2005, 2007, 2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Per Bothner <bothner@cygnus.com>.
@@ -299,7 +299,7 @@ old_do_write (fp, data, to_do)
   if (fp->_flags & _IO_IS_APPENDING)
     /* On a system without a proper O_APPEND implementation,
        you would need to sys_seek(0, SEEK_END) here, but is
-       is not needed nor desirable for Unix- or Posix-like systems.
+       not needed nor desirable for Unix- or Posix-like systems.
        Instead, just indicate that offset (before and after) is
        unpredictable. */
     fp->_old_offset = _IO_pos_BAD;
@@ -654,7 +654,7 @@ resync:
   /* We need to do it since it is possible that the file offset in
      the kernel may be changed behind our back. It may happen when
      we fopen a file and then do a fork. One process may access the
-     the file and the kernel file offset will be changed. */
+     file and the kernel file offset will be changed. */
   if (fp->_old_offset >= 0)
     _IO_SYSSEEK (fp, fp->_old_offset, 0);

diff --git a/libio/wfileops.c b/libio/wfileops.c
index 503d341..386b06b 100644
--- a/libio/wfileops.c
+++ b/libio/wfileops.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1995,1997-2004,2006,2009 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1995,1997-2004,2006,2009,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Ulrich Drepper <drepper@cygnus.com>.
    Based on the single byte version by Per Bothner <bothner@cygnus.com>.
@@ -759,7 +759,7 @@ resync:
   /* We need to do it since it is possible that the file offset in
      the kernel may be changed behind our back. It may happen when
      we fopen a file and then do a fork. One process may access the
-     the file and the kernel file offset will be changed. */
+     file and the kernel file offset will be changed. */
   if (fp->_offset >= 0)
     _IO_SYSSEEK (fp, fp->_offset, 0);

diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index 11bd7ea..b30d1ac 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2003, 2005-2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2003, 2005-2008, 2009, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.

@@ -2565,7 +2565,7 @@ collate_output (struct localedef_t *locale, const struct charmap_t *charmap,
  	  elem_table[idx * 2] = hash;
 	  elem_table[idx * 2 + 1] = obstack_object_size (&extrapool);

-	  /* The the string itself including length.  */
+	  /* The string itself including length.  */
 	  obstack_1grow (&extrapool, namelen);
 	  obstack_grow (&extrapool, runp->name, namelen);

diff --git a/malloc/malloc.c b/malloc/malloc.c
index 3e06b87..dccb6cc 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1,5 +1,5 @@
 /* Malloc implementation for multiple threads without lock contention.
-   Copyright (C) 1996-2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1996-2009, 2010, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Wolfram Gloger <wg@malloc.de>
    and Doug Lea <dl@cs.oswego.edu>, 2001.
@@ -2774,7 +2774,7 @@ mstate av; mchunkptr p; INTERNAL_SIZE_T s;
     always true of any allocated chunk; i.e., that each allocated
     chunk borders either a previously allocated and still in-use
     chunk, or the base of its memory arena. This is ensured
-    by making all allocations from the the `lowest' part of any found
+    by making all allocations from the `lowest' part of any found
     chunk.  This does not necessarily hold however for chunks
     recycled via fastbins.
   */
diff --git a/manual/stdio.texi b/manual/stdio.texi
index 9fb209a..0a70b04 100644
--- a/manual/stdio.texi
+++ b/manual/stdio.texi
@@ -4329,7 +4329,7 @@ the same file position.
 @item
 In a call to @code{fseek} or @code{fseeko} on a text stream, either the
 @var{offset} must be zero, or @var{whence} must be @code{SEEK_SET} and
-and the @var{offset} must be the result of an earlier call to @code{ftell}
+the @var{offset} must be the result of an earlier call to @code{ftell}
 on the same stream.

 @item
diff --git a/misc/fchflags.c b/misc/fchflags.c
index f191194..9e252a8 100644
--- a/misc/fchflags.c
+++ b/misc/fchflags.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1997, 2004, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
 #include <stddef.h>
 #include <sys/stat.h>

-/* Change the flags of the file FD refers to to FLAGS.  */
+/* Change the flags of the file referenced by FD to FLAGS.  */

 int fchflags (int fd, int flags) __THROW;

diff --git a/misc/ftruncate.c b/misc/ftruncate.c
index d4cca2e..e3406af 100644
--- a/misc/ftruncate.c
+++ b/misc/ftruncate.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1997, 1998, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
 #include <sys/types.h>
 #include <unistd.h>

-/* Truncate the file FD refers to to LENGTH bytes.  */
+/* Truncate the file referenced by FD to LENGTH bytes.  */
 int
 __ftruncate (fd, length)
      int fd;
diff --git a/misc/ftruncate64.c b/misc/ftruncate64.c
index df84b7c..a699aed 100644
--- a/misc/ftruncate64.c
+++ b/misc/ftruncate64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 2001, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <unistd.h>

-/* Truncate the file FD refers to to LENGTH bytes.  */
+/* Truncate the file referenced by FD to LENGTH bytes.  */
 int
 __ftruncate64 (fd, length)
      int fd;
diff --git a/misc/tst-efgcvt.c b/misc/tst-efgcvt.c
index 30ab0f1..976635e 100644
--- a/misc/tst-efgcvt.c
+++ b/misc/tst-efgcvt.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2000, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000, 2004, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -184,7 +184,7 @@ special (void)
   (void) ecvt (123.456, 10000, &decpt, &sign);
   (void) fcvt (123.456, 10000, &decpt, &sign);

-  /* Some tests for for the reentrant functions.  */
+  /* Some tests for the reentrant functions.  */
   /* Use a too small buffer.  */
   res = ecvt_r (123.456, 10, &decpt, &sign, buf, 1);
   if (res == 0)
diff --git a/nptl/sysdeps/unix/sysv/linux/pthread_kill.c b/nptl/sysdeps/unix/sysv/linux/pthread_kill.c
index 7508936..73434da 100644
--- a/nptl/sysdeps/unix/sysv/linux/pthread_kill.c
+++ b/nptl/sysdeps/unix/sysv/linux/pthread_kill.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2006, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.

@@ -45,7 +45,7 @@ __pthread_kill (threadid, signo)
     /* Not a valid thread handle.  */
     return ESRCH;

-  /* Disallow sending the signal we use for cancellation, timers, for
+  /* Disallow sending the signal we use for cancellation, timers,
      for the setxid implementation.  */
   if (signo == SIGCANCEL || signo == SIGTIMER || signo == SIGSETXID)
     return EINVAL;
diff --git a/nptl/sysdeps/unix/sysv/linux/pthread_sigqueue.c b/nptl/sysdeps/unix/sysv/linux/pthread_sigqueue.c
index 4440703..69f7dca 100644
--- a/nptl/sysdeps/unix/sysv/linux/pthread_sigqueue.c
+++ b/nptl/sysdeps/unix/sysv/linux/pthread_sigqueue.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2009, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2009.

@@ -49,7 +49,7 @@ pthread_sigqueue (threadid, signo, value)
     /* Not a valid thread handle.  */
     return ESRCH;

-  /* Disallow sending the signal we use for cancellation, timers, for
+  /* Disallow sending the signal we use for cancellation, timers,
      for the setxid implementation.  */
   if (signo == SIGCANCEL || signo == SIGTIMER || signo == SIGSETXID)
     return EINVAL;
diff --git a/nptl/tst-kill4.c b/nptl/tst-kill4.c
index a1b97e7..15626db 100644
--- a/nptl/tst-kill4.c
+++ b/nptl/tst-kill4.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.

@@ -67,7 +67,7 @@ do_test (void)

   /* The following only works because we assume here something about
      the implementation.  Namely, that the memory allocated for the
-     thread descriptor is not going away, that the the TID field is
+     thread descriptor is not going away, that the TID field is
      cleared and therefore the signal is sent to process 0, and that
      we can savely assume there is no other process with this ID at
      that time.  */
diff --git a/nscd/connections.c b/nscd/connections.c
index d9878fa..1e47931 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -1583,7 +1583,7 @@ nscd_run_prune (void *p)


 /* This is the main loop.  It is replicated in different threads but
-   the the use of the ready list makes sure only one thread handles an
+   the use of the ready list makes sure only one thread handles an
    incoming connection.  */
 static void *
 __attribute__ ((__noreturn__))
diff --git a/nss/getnssent_r.c b/nss/getnssent_r.c
index f50667a..cca2932 100644
--- a/nss/getnssent_r.c
+++ b/nss/getnssent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002, 2004, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2002, 2004, 2007, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -164,7 +164,7 @@ __nss_getent_r (const char *getent_func_name,
       status = DL_CALL_FCT (fct.f,
 			    (resbuf, buffer, buflen, &errno, &h_errno));

-      /* The the status is NSS_STATUS_TRYAGAIN and errno is ERANGE the
+      /* The status is NSS_STATUS_TRYAGAIN and errno is ERANGE the
 	 provided buffer is too small.  In this case we should give
 	 the user the possibility to enlarge the buffer and we should
 	 not simply go on with the next service (even if the TRYAGAIN
diff --git a/stdlib/gmp-impl.h b/stdlib/gmp-impl.h
index 85e419d..984885d 100644
--- a/stdlib/gmp-impl.h
+++ b/stdlib/gmp-impl.h
@@ -1,6 +1,6 @@
 /* Include file for internal GNU MP types and definitions.

-Copyright (C) 1991, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+Copyright (C) 1991, 1993, 1994, 1995, 1996, 2011 Free Software Foundation, Inc.

 This file is part of the GNU MP Library.

@@ -241,7 +241,7 @@ extern mp_size_t __gmp_default_fp_limb_precision;
     (r) = _r;								\
     (q) = _q;								\
   } while (0)
-/* Like udiv_qrnnd_preinv, but for for any value D.  DNORM is D shifted left
+/* Like udiv_qrnnd_preinv, but for any value D.  DNORM is D shifted left
    so that its most significant bit is set.  LGUP is ceil(log2(D)).  */
 #define udiv_qrnnd_preinv2gen(q, r, nh, nl, d, di, dnorm, lgup) \
   do {									\
diff --git a/sysdeps/generic/tls.h b/sysdeps/generic/tls.h
index 06e41ad..aa7f9aa 100644
--- a/sysdeps/generic/tls.h
+++ b/sysdeps/generic/tls.h
@@ -1,5 +1,5 @@
 /* Definition for thread-local data handling.  Generic version.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -71,6 +71,6 @@
      THREAD_DTV()

      This macro returns the address of the DTV of the current thread.
-     This normally is done using the the thread register which points
+     This normally is done using the thread register which points
      to the dtv or the TCB (from which the DTV can found).
   */
diff --git a/sysdeps/i386/stpncpy.S b/sysdeps/i386/stpncpy.S
index c163a33..8a3633b 100644
--- a/sysdeps/i386/stpncpy.S
+++ b/sysdeps/i386/stpncpy.S
@@ -1,7 +1,7 @@
 /* copy no more then N bytes from SRC to DEST, returning the address of
    the terminating '\0' in DEST.
    For Intel 80x86, x>=3.
-   Copyright (C) 1994-1997,2000,2002,2005 Free Software Foundation, Inc.
+   Copyright (C) 1994-1997,2000,2002,2005,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>
    Some bug fixes by Alan Modra <Alan@SPRI.Levels.UniSA.Edu.Au>
@@ -56,7 +56,7 @@ ENTRY (BP_SYM (__stpncpy))
 	ALIGN(4)

 	/* Four times unfolded loop with two loop counters.  We get the
-	   the third value (the source address) by using the index+base
+	   third value (the source address) by using the index+base
 	   addressing mode.  */
 L(2):	movb (%eax,%esi), %dl	/* load current char */
 	movb %dl, (%eax)	/* and store it */
diff --git a/sysdeps/ia64/fpu/libm_lgammal.S b/sysdeps/ia64/fpu/libm_lgammal.S
index 407b345..351befb 100644
--- a/sysdeps/ia64/fpu/libm_lgammal.S
+++ b/sysdeps/ia64/fpu/libm_lgammal.S
@@ -7463,7 +7463,7 @@ lgammal_spec:
 { .mfb
       nop.m              0
       nop.f              0
-      // branch out if if x is natval, nan, +inf
+      // branch out if x is natval, nan, +inf
 (p6)  br.cond.spnt       lgammal_nan_pinf
 };;
 { .mfb
diff --git a/sysdeps/ia64/memcmp.S b/sysdeps/ia64/memcmp.S
index 2eed49a..fcc66d0 100644
--- a/sysdeps/ia64/memcmp.S
+++ b/sysdeps/ia64/memcmp.S
@@ -1,6 +1,6 @@
 /* Optimized version of the standard memcmp() function.
    This file is part of the GNU C Library.
-   Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2004, 2011 Free Software Foundation, Inc.
    Contributed by Dan Pop <Dan.Pop@cern.ch>.

    The GNU C Library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
         in1:    src  (aka s2)
         in2:    byte count

-   In this form, it assumes little endian mode.  For big endian mode, the
+   In this form, it assumes little endian mode.  For big endian mode,
    the two shifts in .l2 must be inverted:

 	shl   	tmp1[0] = r[1 + MEMLAT], sh1   // tmp1 = w0 << sh1
diff --git a/sysdeps/ia64/strcpy.S b/sysdeps/ia64/strcpy.S
index 8745c8e..5001f83 100644
--- a/sysdeps/ia64/strcpy.S
+++ b/sysdeps/ia64/strcpy.S
@@ -1,6 +1,6 @@
 /* Optimized version of the standard strcpy() function.
    This file is part of the GNU C Library.
-   Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2003, 2011 Free Software Foundation, Inc.
    Contributed by Dan Pop <Dan.Pop@cern.ch>.

    The GNU C Library is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
         in0:    dest
         in1:    src

-   In this form, it assumes little endian mode.  For big endian mode, the
+   In this form, it assumes little endian mode.  For big endian mode,
    the two shifts in .l2 must be inverted:

 	shl   	value = r[1], sh1   	// value = w0 << sh1
diff --git a/sysdeps/mach/hurd/fchflags.c b/sysdeps/mach/hurd/fchflags.c
index 71bcbf0..dbf19ba 100644
--- a/sysdeps/mach/hurd/fchflags.c
+++ b/sysdeps/mach/hurd/fchflags.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 94, 97, 98 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 97, 98, 11 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
 #include <hurd.h>
 #include <hurd/fd.h>

-/* Change the flags of the file FD refers to to FLAGS.  */
+/* Change the flags of the file referenced by FD to FLAGS.  */

 /* XXX should be __fchflags? */
 int
diff --git a/sysdeps/mach/hurd/fchmod.c b/sysdeps/mach/hurd/fchmod.c
index 025b092..e8714dc 100644
--- a/sysdeps/mach/hurd/fchmod.c
+++ b/sysdeps/mach/hurd/fchmod.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1994, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1994, 1995, 1997, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
 #include <hurd.h>
 #include <hurd/fd.h>

-/* Change the protections of the file FD refers to to MODE.  */
+/* Change the permissions of the file referenced by FD to MODE.  */
 int
 __fchmod (fd, mode)
      int fd;
diff --git a/sysdeps/mach/hurd/ftruncate.c b/sysdeps/mach/hurd/ftruncate.c
index 404459e..b38393e 100644
--- a/sysdeps/mach/hurd/ftruncate.c
+++ b/sysdeps/mach/hurd/ftruncate.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 94, 95, 97, 98 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 95, 97, 98, 11 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
 #include <hurd.h>
 #include <hurd/fd.h>

-/* Truncate the file FD refers to to LENGTH bytes.  */
+/* Truncate the file referenced by FD to LENGTH bytes.  */
 int
 __ftruncate (fd, length)
      int fd;
diff --git a/sysdeps/powerpc/powerpc32/dl-machine.c b/sysdeps/powerpc/powerpc32/dl-machine.c
index ee4c3e0..30c7f96 100644
--- a/sysdeps/powerpc/powerpc32/dl-machine.c
+++ b/sysdeps/powerpc/powerpc32/dl-machine.c
@@ -1,5 +1,5 @@
 /* Machine-dependent ELF dynamic relocation functions.  PowerPC version.
-   Copyright (C) 1995-2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1995-2006, 2008, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -204,7 +204,7 @@ __elf_preferred_address (struct link_map *loader, size_t maplength,
    (1) and (3), this is obvious because only one instruction is
    changed and the PPC architecture guarantees that aligned stores are
    atomic.  For (5), this is more tricky.  When changing (4) to (5),
-   the `b' instruction is first changed to to `mtctr'; this is safe
+   the `b' instruction is first changed to `mtctr'; this is safe
    and is why the `lwzu' instruction is not just a simple `addi'.
    Once this is done, and is visible to all processors, the `lwzu' can
    safely be changed to a `lwz'.  */
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S b/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S
index 8be3cf1..c03dfa3 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S
@@ -1,5 +1,5 @@
 /* sqrt function.  PowerPC32 version.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@
    This part of the function is a leaf routine,  so no need to stack a
    frame or execute prologue/epilogue code. This means it is safe to
    transfer directly to w_sqrt as long as the input value (f1) is
-   preserved. Putting the the sqrt result into f2 (double parameter 2)
+   preserved. Putting the sqrt result into f2 (double parameter 2)
    allows passing both the input value and sqrt result into the extended
    wrapper so there is no need to recompute.
    
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S b/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S
index 9fa282c..050323d 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S
@@ -1,5 +1,5 @@
 /* sqrtf function.  PowerPC32 version.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@
    This part of the function is a leaf routine,  so no need to stack a
    frame or execute prologue/epilogue code. This means it is safe to
    transfer directly to w_sqrt as long as the input value (f1) is
-   preserved. Putting the the sqrt result into f2 (float parameter 2)
+   preserved. Putting the sqrt result into f2 (float parameter 2)
    allows passing both the input value and sqrt result into the extended
    wrapper so there is no need to recompute.
    
diff --git a/sysdeps/powerpc/powerpc32/power4/memcpy.S b/sysdeps/powerpc/powerpc32/power4/memcpy.S
index 73020c6..a11407c 100644
--- a/sysdeps/powerpc/powerpc32/power4/memcpy.S
+++ b/sysdeps/powerpc/powerpc32/power4/memcpy.S
@@ -1,5 +1,5 @@
 /* Optimized memcpy implementation for PowerPC32 on PowerPC64.
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -92,7 +92,7 @@ EALIGN (BP_SYM (memcpy), 5, 0)

   /* Move words where destination and source are word aligned.
      Use an unrolled loop to copy 4 words (16-bytes) per iteration.
-     If the the copy is not an exact multiple of 16 bytes, 1-3 
+     If the copy is not an exact multiple of 16 bytes, 1-3 
      words are copied as needed to set up the main loop.  After
      the main loop exits there may be a tail of 1-3 bytes. These bytes are 
      copied a halfword/byte at a time as needed to preserve alignment.  */
diff --git a/sysdeps/powerpc/powerpc32/power4/strncmp.S b/sysdeps/powerpc/powerpc32/power4/strncmp.S
index fc0835e..5d2c403 100644
--- a/sysdeps/powerpc/powerpc32/power4/strncmp.S
+++ b/sysdeps/powerpc/powerpc32/power4/strncmp.S
@@ -1,5 +1,5 @@
 /* Optimized strcmp implementation for PowerPC32.
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ EALIGN (BP_SYM(strncmp), 4, 0)
 #define rSTR2	r4	/* second string arg */
 #define rN	r5	/* max string length */
 /* Note:  The Bounded pointer support in this code is broken.  This code
-   was inherited from PPC32 and and that support was never completed.  
+   was inherited from PPC32 and that support was never completed.  
    Current PPC gcc does not support -fbounds-check or -fbounded-pointers.  */
 #define rWORD1	r6	/* current word in s1 */
 #define rWORD2	r7	/* current word in s2 */
diff --git a/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S b/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S
index 27a1a0d..1c0f70d 100644
--- a/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S
+++ b/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S
@@ -1,5 +1,5 @@
 /* sqrt function.  PowerPC32 version.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@
    This part of the function looks like a leaf routine,  so no need to
    stack a frame or execute prologue/epilogue code. It is safe to
    branch directly to w_sqrt as long as the input value (f1) is
-   preserved. Putting the the sqrt result into f2 (float parameter 2)
+   preserved. Putting the sqrt result into f2 (float parameter 2)
    allows passing both the input value and sqrt result into the extended
    wrapper so there is no need to recompute.
    
diff --git a/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S b/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S
index 8914855..e638cc1 100644
--- a/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S
+++ b/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S
@@ -1,5 +1,5 @@
 /* sqrtf function.  PowerPC32 version.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@
    This part of the function looks like a leaf routine,  so no need to
    stack a frame or execute prologue/epilogue code. It is safe to
    branch directly to w_sqrt as long as the input value (f1) is
-   preserved. Putting the the sqrt result into f2 (float parameter 2)
+   preserved. Putting the sqrt result into f2 (float parameter 2)
    allows passing both the input value and sqrt result into the extended
    wrapper so there is no need to recompute.
    
diff --git a/sysdeps/powerpc/powerpc32/power6/memcpy.S b/sysdeps/powerpc/powerpc32/power6/memcpy.S
index cafe917..b5e289d 100644
--- a/sysdeps/powerpc/powerpc32/power6/memcpy.S
+++ b/sysdeps/powerpc/powerpc32/power6/memcpy.S
@@ -1,5 +1,5 @@
 /* Optimized memcpy implementation for PowerPC32 on POWER6.
-   Copyright (C) 2003, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2009, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -100,7 +100,7 @@ EALIGN (BP_SYM (memcpy), 5, 0)

   /* Move words where destination and source are word aligned.
      Use an unrolled loop to copy 4 words (16-bytes) per iteration.
-     If the the copy is not an exact multiple of 16 bytes, 1-3
+     If the copy is not an exact multiple of 16 bytes, 1-3
      words are copied as needed to set up the main loop.  After
      the main loop exits there may be a tail of 1-3 bytes. These bytes are
      copied a halfword/byte at a time as needed to preserve alignment.  */
diff --git a/sysdeps/powerpc/powerpc32/power7/strncmp.S b/sysdeps/powerpc/powerpc32/power7/strncmp.S
index ba72d0a..c80b606 100644
--- a/sysdeps/powerpc/powerpc32/power7/strncmp.S
+++ b/sysdeps/powerpc/powerpc32/power7/strncmp.S
@@ -1,5 +1,5 @@
 /* Optimized strcmp implementation for POWER7/PowerPC32.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@ EALIGN (BP_SYM(strncmp),4,0)
 #define rSTR2	r4	/* second string arg */
 #define rN	r5	/* max string length */
 /* Note:  The Bounded pointer support in this code is broken.  This code
-   was inherited from PPC32 and and that support was never completed.
+   was inherited from PPC32 and that support was never completed.
    Current PPC gcc does not support -fbounds-check or -fbounded-pointers.  */
 #define rWORD1	r6	/* current word in s1 */
 #define rWORD2	r7	/* current word in s2 */
diff --git a/sysdeps/powerpc/powerpc32/strncmp.S b/sysdeps/powerpc/powerpc32/strncmp.S
index 3e0fff5..0e0e2a1 100644
--- a/sysdeps/powerpc/powerpc32/strncmp.S
+++ b/sysdeps/powerpc/powerpc32/strncmp.S
@@ -1,5 +1,5 @@
 /* Optimized strcmp implementation for PowerPC32.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ EALIGN (BP_SYM(strncmp), 4, 0)
 #define rSTR2	r4	/* second string arg */
 #define rN	r5	/* max string length */
 /* Note:  The Bounded pointer support in this code is broken.  This code
-   was inherited from PPC32 and and that support was never completed.  
+   was inherited from PPC32 and that support was never completed.  
    Current PPC gcc does not support -fbounds-check or -fbounded-pointers.  */
 #define rWORD1	r6	/* current word in s1 */
 #define rWORD2	r7	/* current word in s2 */
diff --git a/sysdeps/powerpc/powerpc64/memcpy.S b/sysdeps/powerpc/powerpc64/memcpy.S
index f395de9..15869e2 100644
--- a/sysdeps/powerpc/powerpc64/memcpy.S
+++ b/sysdeps/powerpc/powerpc64/memcpy.S
@@ -1,5 +1,5 @@
 /* Optimized memcpy implementation for PowerPC64.
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -94,7 +94,7 @@ EALIGN (BP_SYM (memcpy), 5, 0)

   /* Move doublewords where destination and source are DW aligned.
      Use a unrolled loop to copy 4 doubleword (32-bytes) per iteration.
-     If the the copy is not an exact multiple of 32 bytes, 1-3 
+     If the copy is not an exact multiple of 32 bytes, 1-3 
      doublewords are copied as needed to set up the main loop.  After
      the main loop exits there may be a tail of 1-7 bytes. These byte are 
      copied a word/halfword/byte at a time as needed to preserve alignment.  */
diff --git a/sysdeps/powerpc/powerpc64/power4/memcmp.S b/sysdeps/powerpc/powerpc64/power4/memcmp.S
index a5e0c75..9406a8c 100644
--- a/sysdeps/powerpc/powerpc64/power4/memcmp.S
+++ b/sysdeps/powerpc/powerpc64/power4/memcmp.S
@@ -1,5 +1,5 @@
 /* Optimized strcmp implementation for PowerPC64.
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ EALIGN (BP_SYM(memcmp), 4, 0)
 #define rSTR2	r4	/* second string arg */
 #define rN	r5	/* max string length */
 /* Note:  The Bounded pointer support in this code is broken.  This code
-   was inherited from PPC32 and and that support was never completed.  
+   was inherited from PPC32 and that support was never completed.
    Current PPC gcc does not support -fbounds-check or -fbounded-pointers.  */
 #define rWORD1	r6	/* current word in s1 */
 #define rWORD2	r7	/* current word in s2 */
diff --git a/sysdeps/powerpc/powerpc64/power4/memcpy.S b/sysdeps/powerpc/powerpc64/power4/memcpy.S
index 56f313b..64f8fe8 100644
--- a/sysdeps/powerpc/powerpc64/power4/memcpy.S
+++ b/sysdeps/powerpc/powerpc64/power4/memcpy.S
@@ -1,5 +1,5 @@
 /* Optimized memcpy implementation for PowerPC64.
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -96,7 +96,7 @@ EALIGN (BP_SYM (memcpy), 5, 0)

   /* Move doublewords where destination and source are DW aligned.
      Use a unrolled loop to copy 4 doubleword (32-bytes) per iteration.
-     If the the copy is not an exact multiple of 32 bytes, 1-3 
+     If the copy is not an exact multiple of 32 bytes, 1-3
      doublewords are copied as needed to set up the main loop.  After
      the main loop exits there may be a tail of 1-7 bytes. These byte are 
      copied a word/halfword/byte at a time as needed to preserve alignment.  */
diff --git a/sysdeps/powerpc/powerpc64/power4/strncmp.S b/sysdeps/powerpc/powerpc64/power4/strncmp.S
index 7a1665d..8e3da60 100644
--- a/sysdeps/powerpc/powerpc64/power4/strncmp.S
+++ b/sysdeps/powerpc/powerpc64/power4/strncmp.S
@@ -1,5 +1,5 @@
 /* Optimized strcmp implementation for PowerPC64.
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ EALIGN (BP_SYM(strncmp), 4, 0)
 #define rSTR2	r4	/* second string arg */
 #define rN	r5	/* max string length */
 /* Note:  The Bounded pointer support in this code is broken.  This code
-   was inherited from PPC32 and and that support was never completed.  
+   was inherited from PPC32 and that support was never completed.
    Current PPC gcc does not support -fbounds-check or -fbounded-pointers.  */
 #define rWORD1	r6	/* current word in s1 */
 #define rWORD2	r7	/* current word in s2 */
diff --git a/sysdeps/powerpc/powerpc64/power6/memcpy.S b/sysdeps/powerpc/powerpc64/power6/memcpy.S
index d105f83..1edc7c9 100644
--- a/sysdeps/powerpc/powerpc64/power6/memcpy.S
+++ b/sysdeps/powerpc/powerpc64/power6/memcpy.S
@@ -1,5 +1,5 @@
 /* Optimized memcpy implementation for PowerPC64.
-   Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2007, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -119,7 +119,7 @@ EALIGN (BP_SYM (memcpy), 7, 0)

   /* Move doublewords where destination and source are DW aligned.
      Use a unrolled loop to copy 16 doublewords (128-bytes) per iteration.
-     If the the copy is not an exact multiple of 128 bytes, 1-15
+     If the copy is not an exact multiple of 128 bytes, 1-15
      doublewords are copied as needed to set up the main loop.  After
      the main loop exits there may be a tail of 1-7 bytes. These byte
      are copied a word/halfword/byte at a time as needed to preserve
diff --git a/sysdeps/powerpc/powerpc64/power7/memcmp.S b/sysdeps/powerpc/powerpc64/power7/memcmp.S
index f1afffb..dcf0f9d 100644
--- a/sysdeps/powerpc/powerpc64/power7/memcmp.S
+++ b/sysdeps/powerpc/powerpc64/power7/memcmp.S
@@ -1,5 +1,5 @@
 /* Optimized memcmp implementation for POWER7/PowerPC64.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@ EALIGN (BP_SYM(memcmp),4,0)
 #define rSTR2	r4	/* second string arg */
 #define rN	r5	/* max string length */
 /* Note:  The Bounded pointer support in this code is broken.  This code
-   was inherited from PPC32 and and that support was never completed.
+   was inherited from PPC32 and that support was never completed.
    Current PPC gcc does not support -fbounds-check or -fbounded-pointers.  */
 #define rWORD1	r6	/* current word in s1 */
 #define rWORD2	r7	/* current word in s2 */
diff --git a/sysdeps/powerpc/powerpc64/power7/strncmp.S b/sysdeps/powerpc/powerpc64/power7/strncmp.S
index 34f1e52..bee14b4 100644
--- a/sysdeps/powerpc/powerpc64/power7/strncmp.S
+++ b/sysdeps/powerpc/powerpc64/power7/strncmp.S
@@ -1,5 +1,5 @@
 /* Optimized strcmp implementation for POWER7/PowerPC64.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ EALIGN (BP_SYM(strncmp),4,0)
 #define rSTR2	r4	/* second string arg */
 #define rN	r5	/* max string length */
 /* Note:  The Bounded pointer support in this code is broken.  This code
-   was inherited from PPC32 and and that support was never completed.
+   was inherited from PPC32 and that support was never completed.
    Current PPC gcc does not support -fbounds-check or -fbounded-pointers.  */
 #define rWORD1	r6	/* current word in s1 */
 #define rWORD2	r7	/* current word in s2 */
diff --git a/sysdeps/powerpc/powerpc64/strchr.S b/sysdeps/powerpc/powerpc64/strchr.S
index 93ea61e..d31a26c 100644
--- a/sysdeps/powerpc/powerpc64/strchr.S
+++ b/sysdeps/powerpc/powerpc64/strchr.S
@@ -1,5 +1,5 @@
 /* Optimized strchr implementation for PowerPC64.
-   Copyright (C) 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2000, 2002, 2003, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ ENTRY (BP_SYM (strchr))
 #define rTMP1	r0
 #define rRTN	r3	/* outgoing result */
 /* Note:  The Bounded pointer support in this code is broken.  This code
-   was inherited from PPC32 and and that support was never completed.  
+   was inherited from PPC32 and that support was never completed.
    Currently PPC gcc does not support -fbounds-check or -fbounded-pointers.
    These artifacts are left in the code as a reminder in case we need
    bounded pointer support in the future.  */
diff --git a/sysdeps/powerpc/powerpc64/strcmp.S b/sysdeps/powerpc/powerpc64/strcmp.S
index 4d7eb21..06cc2cf 100644
--- a/sysdeps/powerpc/powerpc64/strcmp.S
+++ b/sysdeps/powerpc/powerpc64/strcmp.S
@@ -1,5 +1,5 @@
 /* Optimized strcmp implementation for PowerPC64.
-   Copyright (C) 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2000, 2002, 2003, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ EALIGN (BP_SYM(strcmp), 4, 0)
 #define rSTR1	r3	/* first string arg */
 #define rSTR2	r4	/* second string arg */
 /* Note:  The Bounded pointer support in this code is broken.  This code
-   was inherited from PPC32 and and that support was never completed.  
+   was inherited from PPC32 and that support was never completed.  
    Current PPC gcc does not support -fbounds-check or -fbounded-pointers.
    These artifacts are left in the code as a reminder in case we need
    bounded pointer support in the future.  */
diff --git a/sysdeps/powerpc/powerpc64/strcpy.S b/sysdeps/powerpc/powerpc64/strcpy.S
index e9e9fc7..e57eeb3 100644
--- a/sysdeps/powerpc/powerpc64/strcpy.S
+++ b/sysdeps/powerpc/powerpc64/strcpy.S
@@ -1,5 +1,5 @@
 /* Optimized strcpy implementation for PowerPC64.
-   Copyright (C) 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2000, 2002, 2003, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ EALIGN (BP_SYM (strcpy), 4, 0)
 #define rTMP	r0
 #define rRTN	r3	/* incoming DEST arg preserved as result */
 /* Note.  The Bounded pointer support in this code is broken.  This code
-   was inherited from PPC32 and and that support was never completed.  
+   was inherited from PPC32 and that support was never completed.  
    Current PPC gcc does not support -fbounds-check or -fbounded-pointers.
    These artifacts are left in the code as a reminder in case we need
    bounded pointer support in the future.  */
diff --git a/sysdeps/powerpc/powerpc64/strlen.S b/sysdeps/powerpc/powerpc64/strlen.S
index 4c1385a..aa22896 100644
--- a/sysdeps/powerpc/powerpc64/strlen.S
+++ b/sysdeps/powerpc/powerpc64/strlen.S
@@ -1,5 +1,5 @@
 /* Optimized strlen implementation for PowerPC64.
-   Copyright (C) 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2000, 2002, 2003, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -96,7 +96,7 @@ ENTRY (BP_SYM (strlen))
 #define rTMP4	r12

 /* Note:  The Bounded pointer support in this code is broken.  This code
-   was inherited from PPC32 and and that support was never completed.  
+   was inherited from PPC32 and that support was never completed.
    Current PPC gcc does not support -fbounds-check or -fbounded-pointers.
    These artifacts are left in the code as a reminder in case we need
    bounded pointer support in the future.  */
diff --git a/sysdeps/powerpc/powerpc64/strncmp.S b/sysdeps/powerpc/powerpc64/strncmp.S
index 34479e2..84e7b69 100644
--- a/sysdeps/powerpc/powerpc64/strncmp.S
+++ b/sysdeps/powerpc/powerpc64/strncmp.S
@@ -1,5 +1,5 @@
 /* Optimized strcmp implementation for PowerPC64.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ EALIGN (BP_SYM(strncmp), 4, 0)
 #define rSTR2	r4	/* second string arg */
 #define rN	r5	/* max string length */
 /* Note:  The Bounded pointer support in this code is broken.  This code
-   was inherited from PPC32 and and that support was never completed.  
+   was inherited from PPC32 and that support was never completed.
    Current PPC gcc does not support -fbounds-check or -fbounded-pointers.  */
 #define rWORD1	r6	/* current word in s1 */
 #define rWORD2	r7	/* current word in s2 */
diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
index b789a32..c053adc 100644
--- a/sysdeps/unix/sysv/linux/check_pf.c
+++ b/sysdeps/unix/sysv/linux/check_pf.c
@@ -1,5 +1,5 @@
 /* Determine protocol families for which interfaces exist.  Linux version.
-   Copyright (C) 2003, 2006, 2007, 2008, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -240,7 +240,7 @@ out_fail:
 }


-/* We don't know if we have NETLINK support compiled in in our
+/* We don't know if we have NETLINK support compiled into our
    Kernel.  */
 #if __ASSUME_NETLINK_SUPPORT == 0
 /* Define in ifaddrs.h.  */
diff --git a/sysdeps/unix/sysv/linux/ftruncate64.c b/sysdeps/unix/sysv/linux/ftruncate64.c
index 60e7ae0..5330719 100644
--- a/sysdeps/unix/sysv/linux/ftruncate64.c
+++ b/sysdeps/unix/sysv/linux/ftruncate64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997,1998,1999,2000,2001,2003,2005,2006
+/* Copyright (C) 1997,1998,1999,2000,2001,2003,2005,2006,2011
 	 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

@@ -34,7 +34,7 @@ extern int __have_no_truncate64;
 #endif


-/* Truncate the file FD refers to to LENGTH bytes.  */
+/* Truncate the file referenced by FD to LENGTH bytes.  */
 int
 __ftruncate64 (int fd, off64_t length)
 {
diff --git a/sysdeps/unix/sysv/linux/ifaddrs.c b/sysdeps/unix/sysv/linux/ifaddrs.c
index 84f223d..ca8c490 100644
--- a/sysdeps/unix/sysv/linux/ifaddrs.c
+++ b/sysdeps/unix/sysv/linux/ifaddrs.c
@@ -1,5 +1,5 @@
 /* getifaddrs -- get names and addresses of all network interfaces
-   Copyright (C) 2003-2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2003-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -38,7 +38,7 @@
 #include "netlinkaccess.h"


-/* We don't know if we have NETLINK support compiled in in our
+/* We don't know if we have NETLINK support compiled into our
    Kernel, so include the old implementation as fallback.  */
 #if __ASSUME_NETLINK_SUPPORT == 0
 int __no_netlink_support attribute_hidden;
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c
index e83f7f0..3d70be8 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2002,2005,2006 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2002,2005,2006,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@ extern int __have_no_truncate64;
 #endif


-/* Truncate the file FD refers to to LENGTH bytes.  */
+/* Truncate the file referenced by FD to LENGTH bytes.  */
 int
 __ftruncate64 (fd, length)
      int fd;
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c
index f107e84..d1f55e4 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997,1998,1999,2000,2002,2005,2006
+/* Copyright (C) 1997,1998,1999,2000,2002,2005,2006,2011
 	Free Software Foundation, Inc.
    This file is part of the GNU C Library.

@@ -34,7 +34,7 @@ int __have_no_truncate64;
 #endif


-/* Truncate the file FD refers to to LENGTH bytes.  */
+/* Truncate the file referenced by FD to LENGTH bytes.  */
 int
 truncate64 (path, length)
      const char *path;
diff --git a/sysdeps/unix/sysv/linux/truncate64.c b/sysdeps/unix/sysv/linux/truncate64.c
index f43cffe..63efed8 100644
--- a/sysdeps/unix/sysv/linux/truncate64.c
+++ b/sysdeps/unix/sysv/linux/truncate64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2000,2003,2004,2005,2006
+/* Copyright (C) 1997-2000,2003,2004,2005,2006,2011
 	Free Software Foundation, Inc.
    This file is part of the GNU C Library.

@@ -34,7 +34,7 @@
 int __have_no_truncate64;
 #endif

-/* Truncate the file FD refers to to LENGTH bytes.  */
+/* Truncate the file referenced by FD to LENGTH bytes.  */
 int
 truncate64 (const char *path, off64_t length)
 {
diff --git a/time/strptime_l.c b/time/strptime_l.c
index ccd2a90..e99b157 100644
--- a/time/strptime_l.c
+++ b/time/strptime_l.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002,2004,2005,2007,2008,2010 Free Software Foundation, Inc.
+/* Copyright (C) 2002,2004,2005,2007,2008,2010,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -213,7 +213,7 @@ static void
 day_of_the_week (struct tm *tm)
 {
   /* We know that January 1st 1970 was a Thursday (= 4).  Compute the
-     the difference between this data in the one on TM and so determine
+     difference between this data in the one on TM and so determine
      the weekday.  */
   int corr_year = 1900 + tm->tm_year - (tm->tm_mon < 2);
   int wday = (-473
-- 
1.7.5.rc2.295.g19c42


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]