aboutsummaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2011-06-10 12:45:09 -0700
committerRoland McGrath <roland@hack.frob.com>2011-06-10 22:44:20 -0700
commit5615eaf26469f20c2d8c3be5770e12564a1edfff (patch)
treecf9eb7a5797cd7c9dd4680b0463859dcd8376328 /locale
parentb68e08db76547937ea6e1902e87a5ea98c906f0c (diff)
downloadglibc-5615eaf26469f20c2d8c3be5770e12564a1edfff.zip
glibc-5615eaf26469f20c2d8c3be5770e12564a1edfff.tar.gz
glibc-5615eaf26469f20c2d8c3be5770e12564a1edfff.tar.bz2
Quash some new warnings from GCC 4.6.
Diffstat (limited to 'locale')
-rw-r--r--locale/programs/ld-collate.c2
-rw-r--r--locale/programs/ld-ctype.c4
-rw-r--r--locale/programs/locarchive.c3
3 files changed, 1 insertions, 8 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index b30d1ac..a0a0159 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -1987,7 +1987,6 @@ add_to_tablewc (uint32_t ch, struct element_t *runp)
{
/* As for the singlebyte table, we recognize sequences and
compress them. */
- struct element_t *lastp;
collidx_table_add (atwc.tablewc, ch,
-(obstack_object_size (atwc.extrapool)
@@ -2087,7 +2086,6 @@ add_to_tablewc (uint32_t ch, struct element_t *runp)
}
/* Next entry. */
- lastp = runp;
runp = runp->wcnext;
}
while (runp != NULL);
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index 376a02c..36d0a99 100644
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2006, 2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2006,2007,2009,2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
@@ -2209,7 +2209,6 @@ ctype_read (struct linereader *ldfile, struct localedef_t *result,
struct token *now;
enum token_t nowtok;
size_t cnt;
- struct charseq *last_seq;
uint32_t last_wch = 0;
enum token_t last_token;
enum token_t ellipsis_token;
@@ -2465,7 +2464,6 @@ ctype_read (struct linereader *ldfile, struct localedef_t *result,
}
else
last_str = NULL;
- last_seq = seq;
last_wch = wch;
memcpy (last_charcode, now->val.charcode.bytes, 16);
last_charcode_len = now->val.charcode.nbytes;
diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index 943bc5a..770a731 100644
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -300,7 +300,6 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head)
void *p;
unsigned int cnt, loccnt;
struct namehashent *oldnamehashtab;
- struct locrecent *oldlocrectab;
struct locarhandle new_ah;
size_t prefix_len = output_prefix ? strlen (output_prefix) : 0;
char archivefname[prefix_len + sizeof (ARCHIVE_NAME)];
@@ -431,8 +430,6 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head)
still referenced and transfer it into the new file. */
oldnamehashtab = (struct namehashent *) ((char *) ah->addr
+ head->namehash_offset);
- oldlocrectab = (struct locrecent *) ((char *) ah->addr
- + head->locrectab_offset);
/* Sort the old locrec table in order of data position. */
struct oldlocrecent oldlocrecarray[head->namehash_size];