This is the mail archive of the
elfutils-devel@sourceware.org
mailing list for the elfutils project.
Re: [PATCH] doubled words
- From: Marek Polacek <mpolacek at redhat dot com>
- To: elfutils-devel at lists dot fedorahosted dot org
- Date: Sat, 16 Apr 2011 13:54:25 +0200
- Subject: Re: [PATCH] doubled words
On 04/16/2011 01:07 PM, Ulrich Drepper wrote:
> But it's not. The last change for ldgeneric.c should fix up the whole
> comment and not change just the duplication.
I've amended that commit. OK now?
> Aside, changes without any code changes shouldn't pollute the ChangeLog files.
Sounds sensible. BTW: Ulrich, would you accept a similar patch for glibc? I've run
Jim's script and there are quite a lot of duplications. Thanks.
Signed-off-by: Marek Polacek <mpolacek@redhat.com>
---
libebl/eblrelativerelocp.c | 2 +-
libelf/libelfP.h | 2 +-
src/arlib.c | 2 +-
src/elf32-i386.script | 2 +-
src/ld.c | 2 +-
src/ldgeneric.c | 5 ++---
6 files changed, 7 insertions(+), 8 deletions(-)
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@redhat.com>, 2006.
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/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..5b26fcf 100644
--- a/src/ldgeneric.c
+++ b/src/ldgeneric.c
@@ -5854,9 +5854,8 @@ section index too large in dynamic symbol table"));
- the symbol is for a file
- 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)
+ - export_all_dynamic is not set and is only defined in
+ the executable (i.e., it is defined, but not (also) in 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