Hi,
I've used this Jim Meyering's script (thanks!) to find doubled words:
git ls-files .|xargs perl -0777 -n \
-e 'while (/\b(then?|in|an|it|on|if|at|but|f?or|and|to)\s+\1\b/gms)' \
-e '{$n=($` =~ tr/\n/\n/ + 1); ($v=$&)=~s/\n/\\n/g; print
"$ARGV:$n:$v\n"}'
Here's a patch that fixes all these occurrences. Ok to apply?
Signed-off-by: Marek Polacek <mpolacek(a)redhat.com>
---
libebl/ChangeLog | 4 ++++
libebl/eblrelativerelocp.c | 2 +-
libelf/ChangeLog | 4 ++++
libelf/libelfP.h | 2 +-
src/ChangeLog | 7 +++++++
src/arlib.c | 2 +-
src/elf32-i386.script | 2 +-
src/ld.c | 2 +-
src/ldgeneric.c | 2 +-
9 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/libebl/ChangeLog b/libebl/ChangeLog
index 97315f0..56c5d04 100644
--- a/libebl/ChangeLog
+++ b/libebl/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-15 Marek Polacek <mpolacek(a)redhat.com>
+
+ * eblrelativerelocp.c: Fix doubled word.
+
2011-03-21 Marek Polacek <mpolacek(a)redhat.com>
* ebldynamictagname.c: Fix typo in TLSDESC_GOT.
diff --git a/libebl/eblrelativerelocp.c b/libebl/eblrelativerelocp.c
index 8ea97b8..9c28b59 100644
--- a/libebl/eblrelativerelocp.c
+++ b/libebl/eblrelativerelocp.c
@@ -1,4 +1,4 @@
-/* Check whether given relocation is a relocation relocation.
+/* Check whether given relocation is a relative relocation.
Copyright (C) 2006 Red Hat, Inc.
This file is part of Red Hat elfutils.
Written by Ulrich Drepper <drepper(a)redhat.com>, 2006.
diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index d88e2fe..3176648 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-15 Marek Polacek <mpolacek(a)redhat.com>
+
+ * libelfP.h: Fix doubled word.
+
2011-01-05 Jan Kratochvil <jan.kratochvil(a)redhat.com>
* elf_getdata_rawchunk.c (elf_getdata_rawchunk): Fix off64_t overflow
diff --git a/libelf/libelfP.h b/libelf/libelfP.h
index 2b8391b..8f2f33a 100644
--- a/libelf/libelfP.h
+++ b/libelf/libelfP.h
@@ -251,7 +251,7 @@ struct Elf_Scn
char *rawdata_base; /* The unmodified data of the section. */
char *data_base; /* The converted data of the section. */
- struct Elf_ScnList *list; /* Pointer the the section list element the
+ struct Elf_ScnList *list; /* Pointer to the section list element the
data is in. */
};
diff --git a/src/ChangeLog b/src/ChangeLog
index 956cce2..031d009 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-15 Marek Polacek <mpolacek(a)redhat.com>
+
+ * ar.c (arlib_init): Fix doubled word.
+ * elf32-i386.script: Likewise.
+ * ld.c (create_lscript_symbols): Likewise.
+ * ldgeneric.c (ld_generic_create_outfile): Likewise.
+
2011-03-24 Petr Machata <pmachata(a)redhat.com>
* readelf.c (print_debug_line_section): Emit initial space for all
diff --git a/src/arlib.c b/src/arlib.c
index af98454..c69a138 100644
--- a/src/arlib.c
+++ b/src/arlib.c
@@ -61,7 +61,7 @@ arlib_init (void)
/* Using snprintf here has a problem: the call always wants to add a
NUL byte. We could use a trick whereby we specify the target
buffer size longer than it is and this would not actually fail,
- since all the fields are consecutive and we fill them in in
+ since all the fields are consecutive and we fill them in
sequence (i.e., the NUL byte gets overwritten). But
_FORTIFY_SOURCE=2 would not let us play these games. Therefore
we play it safe. */
diff --git a/src/elf32-i386.script b/src/elf32-i386.script
index a6cfffa..2083278 100644
--- a/src/elf32-i386.script
+++ b/src/elf32-i386.script
@@ -120,7 +120,7 @@ SEGMENT [RW]
is in. */
KEEP (*crtbegin.o(.ctors))
/* We don't want to include the .ctor section from
- from the crtend.o file until after the sorted ctors.
+ the crtend.o file until after the sorted ctors.
The .ctor section from the crtend file contains the
end of ctors marker and it must be last */
KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
diff --git a/src/ld.c b/src/ld.c
index 932496e..a3b0934 100644
--- a/src/ld.c
+++ b/src/ld.c
@@ -1465,7 +1465,7 @@ static void
create_lscript_symbols (void)
{
/* Walk through the data from the linker script and generate all the
- symbols which are required to be present and and those marked
+ symbols which are required to be present and those marked
with PROVIDE if there is a undefined reference. */
if (ld_state.output_segments == NULL)
return;
diff --git a/src/ldgeneric.c b/src/ldgeneric.c
index d51b54f..50f9c04 100644
--- a/src/ldgeneric.c
+++ b/src/ldgeneric.c
@@ -5856,7 +5856,7 @@ section index too large in dynamic symbol table"));
- it is not externally visible (internal, hidden)
- if export_all_dynamic is not set and is only defined in
the executable (i.e., it is defined, but not (also) in
- in DSO)
+ DSO)
Set symstrent[cnt] to NULL in case an entry is ignored. */
if (XELF_ST_TYPE (sym->st_info) == STT_FILE
--
1.7.3.4
Show replies by date