aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-25 20:26:58 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-25 20:26:58 +0000
commit45a9eda2f9b8245d1586ceb51bb3543fc2a2a9f6 (patch)
treec4c63c0ac2f40bc6af4f7a4803d7de6348e2f557
parent7508aab40ac00f7b0e6c6b42b42f3100bf73554b (diff)
downloadglibc-45a9eda2f9b8245d1586ceb51bb3543fc2a2a9f6.tar
glibc-45a9eda2f9b8245d1586ceb51bb3543fc2a2a9f6.tar.gz
glibc-45a9eda2f9b8245d1586ceb51bb3543fc2a2a9f6.tar.bz2
glibc-45a9eda2f9b8245d1586ceb51bb3543fc2a2a9f6.zip
Update.
* locale/programs/ld-address.c (INT_STR_ELEM): Correct test for unknown character.
-rw-r--r--ChangeLog3
-rw-r--r--locale/programs/ld-address.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 249fd8edbb..b98e41f172 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2000-06-25 Ulrich Drepper <drepper@redhat.com>
+ * locale/programs/ld-address.c (INT_STR_ELEM): Correct test for
+ unknown character.
+
* locale/programs/ld-collate.c: Correct handling of different
collation sections.
* locale/programs/localedef.c (add_to_readlist): Take locale pointer
diff --git a/locale/programs/ld-address.c b/locale/programs/ld-address.c
index d440b36ae8..e35305d44c 100644
--- a/locale/programs/ld-address.c
+++ b/locale/programs/ld-address.c
@@ -520,7 +520,8 @@ address_read (struct linereader *ldfile, struct localedef_t *result,
if (address->cat != NULL) \
lr_error (ldfile, _("\
%s: field `%s' declared more than once"), "LC_ADDRESS", #cat); \
- else if (!ignore_content && arg->val.str.startmb == NULL) \
+ else if (!ignore_content && arg->tok == tok_string \
+ && arg->val.str.startmb == NULL) \
{ \
lr_error (ldfile, _("\
%s: unknown character in field `%s'"), "LC_ADDRESS", #cat); \