about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2000-09-07 09:16:34 +0000
committerAndreas Jaeger <aj@suse.de>2000-09-07 09:16:34 +0000
commit6ce42684c4a9c20e4e4fe6692896f165a1637149 (patch)
treef767f9984d70662be8fa805b4b8eeff9937ae02f
parent47a03c51c8d02a1643990f976e72289333f41951 (diff)
downloadglibc-6ce42684c4a9c20e4e4fe6692896f165a1637149.tar.gz
glibc-6ce42684c4a9c20e4e4fe6692896f165a1637149.tar.xz
glibc-6ce42684c4a9c20e4e4fe6692896f165a1637149.zip
* locale/programs/ld-collate.c (handle_ellipsis): Fix typo.
* elf/dl-load.c (_dl_map_object_from_fd): Likewise. 
Reported by GOTO Masanori <gotom@debian.or.jp>.
-rw-r--r--elf/dl-load.c2
-rw-r--r--locale/programs/ld-collate.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 9dfa482b62..4fd4dfbe2e 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -849,7 +849,7 @@ _dl_map_object_from_fd (const char *name, int fd, char *realname,
     }
 
   if (__builtin_expect (header->e_version, EV_CURRENT) != EV_CURRENT)
-    LOSE (0, N_("ELF file version does not not match current one"));
+    LOSE (0, N_("ELF file version does not match current one"));
   if (! __builtin_expect (elf_machine_matches_host (header->e_machine), 1))
     LOSE (0, N_("ELF file machine architecture does not match"));
   if (__builtin_expect (header->e_phentsize, sizeof (ElfW(Phdr)))
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index 1bfce616f3..f7aaf0d34f 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -1309,7 +1309,7 @@ order for `%.*s' already defined at %s:%Zu"),
 
 		  if (elem->name == NULL)
 		    {
-		      lr_error (ldfile, _("%s: `%s' must be a charater"),
+		      lr_error (ldfile, _("%s: `%s' must be a character"),
 				"LC_COLLATE", buf);
 		      continue;
 		    }